to ammend

psypuff · May 6, 2016 · aeeea09 · aeeea09
1 parent 1ed0a17
commit aeeea09
Show file tree

Hide file tree

Showing 14 changed files with 7,313 additions and 189 deletions.
diff --git a/app/views/Index.scala.html b/app/views/Index.scala.html
@@ -9,7 +9,7 @@
         <title>{{title}}</title>
         <link rel="icon" type="image/png" href='@routes.Assets.versioned("img/favicon.png")'>
         <link rel="stylesheet" href='@routes.Assets.versioned("css/app.css")'>
-        <link rel='stylesheet' href='@routes.WebJarAssets.at(WebJarAssets.locate("css/bootstrap.min.css"))'>
+        <link rel="stylesheet" href='@routes.Assets.versioned("css/bootstrap.min.css")'>
         <link rel='stylesheet' href='@routes.WebJarAssets.at(WebJarAssets.locate("css/font-awesome.min.css"))'>
         <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("tether.min.js"))'></script>
         <script type='text/javascript' src='@routes.WebJarAssets.at(WebJarAssets.locate("jquery.min.js"))'></script>
@@ -19,7 +19,7 @@
         <script src='@routes.Assets.versioned("app.js")'></script>
         <script src='@routes.Assets.versioned("lib.js")'></script>
     </head>
-    <body class="bg-inverse">
+    <body>
         <div ng-include src="'alerts.html'" ng-controller="AlertsController" class="alerts"></div>
         <div ng-include src="'navbar.html'"></div>
         <div class="container-fluid main">

diff --git a/build.sbt b/build.sbt
@@ -7,7 +7,7 @@ scalaVersion := "2.11.6"
 libraryDependencies ++= Seq(
   "org.webjars"       %% "webjars-play"  % "2.4.0-1",
   "org.webjars"       %  "angularjs"     % "1.5.0",
-  "org.webjars"       %  "bootstrap"     % "4.0.0-alpha.2",
+  "org.webjars"       %  "bootstrap"     % "3.3.6",
   "org.webjars"       %  "font-awesome"  % "4.5.0",
   "org.webjars.bower" %  "tether"        % "1.1.1",
   "org.elasticsearch" %  "elasticsearch" % "2.2.0",

diff --git a/public/app.js b/public/app.js
@@ -47,7 +47,7 @@ function AceEditor(target) {
     this.format = function() {
         var content = this.editor.getValue();
         try {
-            if (isDefined(content) && content.trim().length > 0) {
+            if (content && content.trim().length > 0) {
                 this.error = null;
                 content = JSON.stringify(JSON.parse(content), undefined, 2);
                 this.editor.setValue(content, 0);
@@ -889,10 +889,11 @@ angular.module('cerebro').directive('ngProgress',
         },
         template: function (elem, attrs) {
           return '<span class="detail">{{text}}</span>' +
-              '<progress class="progress progress-thin" value="{{value}}" max="{{max}}"' +
-              'ng-class="{\'progress-danger\': {{(value / max) > 0.75}}}">' +
+                  '<div class="progress progress-thin">' +
+              '<div class="progress-bar-info" style="width: {{value}}%"' +
+              'ng-class="{\'progress-bar-danger\': {{(value / max) > 0.75}}}">' +
               '{{value}}%' +
-              '</progress>'
+              '</div></div>'
         }
       };
     }

diff --git a/public/connect.html b/public/connect.html
@@ -20,7 +20,7 @@ <h2><i class="fa fa-cloud"></i> Welcome to Cerebro</h2>
       <div class="form-group row">
         <div class="col-xs-12">
           <label for="newHost">Connect to a new host</label>
-          <input id="newHost" type="text" ng-model="host" class="form-control form-control-sm form-inverse" placeholder="example: http://localhost:9200">
+          <input id="newHost" type="text" ng-model="host" class="form-control form-control-sm" placeholder="example: http://localhost:9200">
         </div>
       </div>
       <div class="form-group row">

diff --git a/public/css/app.css b/public/css/app.css
@@ -1,38 +1,14 @@
-html, body {
-    height: 100%;
-}
 body {
     padding-top: 50px;
 }
 
 .content {
     padding-top: 20px;
     padding-bottom: 10px;
-    font-size: 13px;
-    font-weight: 300;
     height: 100%;
     min-height: 100%;
 }
 
-.navbar-fixed-top {
-    border: 0;
-}
-
-.main {
-    padding: 20px;
-}
-
-@media (min-width: 768px) {
-    .main {
-        padding-right: 40px;
-        padding-left: 40px;
-    }
-}
-
-.main .page-header {
-    margin-top: 0;
-}
-
 /** Overview **/
 table.shard-map {
     table-layout: fixed;
@@ -109,7 +85,7 @@ table.shard-map {
     height: 22px;
     vertical-align: middle;
     text-align: center;
-    line-height: 16px;
+    line-height: 17px;
     margin-top: 2px;
     margin-bottom: 2px;
 }
@@ -193,17 +169,6 @@ table.shard-map {
     background-color: #1CA8DD;
 }
 
-/** Forms Inverse **/
-.form-inverse {
-    background-color: #434749 !important;
-    border-color: #4d5154 !important;
-    color: #fff !important;
-}
-.form-inverse:-webkit-input-placeholder { color: white; font-weight: 800; }
-.form-inverse:-moz-placeholder { color: white; }
-.form-inverse:-moz-placeholder { color: white; }
-.form-inverse:-ms-input-placeholder { color: white; }
-
 /** Nodes **/
 .node-badges {
     width: 20px;
@@ -270,18 +235,6 @@ table.shard-map {
 .node-labels {
     padding-top: 5px;
 }
-.dropdown-menu {
-    color: #fff !important;
-    background-color: #373a3c !important;
-    font-size: 12px !important;
-    font-weight: 300;
-}
-.dropdown-item {
-    color: #fff !important;
-}
-.dropdown-item:hover {
-    color: #373a3c !important;
-}
 
 .red {
     color: #E64759 !important;
@@ -342,26 +295,12 @@ table.shard-map {
     border: none !important;
 }
 .btn {
-    background: #434749 !important;
     border: 2px solid !important;
-    font-size: 13px !important;
-    opacity: 0.7 !important;
+    opacity: 0.7;
 }
 .btn:hover {
     opacity: 1 !important;
 }
-.btn-default {
-    color: #8B8F95 !important;
-    border-color: #8B8F95 !important;
-}
-.btn-default {
-    color: #8B8F95 !important;
-    border-color: #8B8F95 !important;
-}
-.btn-primary {
-    color: #1AC98E !important;
-    border-color: #1AC98E !important;
-}
 .nav-element {
     display: block;
     padding-top: .425rem;
@@ -377,10 +316,6 @@ table.shard-map {
     float: none;
 }
 
-.navbar-dark .navbar-nav .nav-link {
-    font-weight: 300 !important;
-}
-
 /* JSON TREE CSS */
 .jstValue {
     white-space: pre-wrap;
@@ -441,9 +376,9 @@ table.shard-map {
     display: none;
 }
 
-.typeahead-demo .custom-popup-wrapper > .message {
-    border-bottom: 1px solid #ddd;
-    color: #868686;
+.typeahead > li > a {
+    border-bottom: 1px solid #55595c;
+
 }
 
 .typeahead-demo .custom-popup-wrapper > .dropdown-menu {
@@ -454,33 +389,9 @@ table.shard-map {
     border-radius: 0;
     box-shadow: none;
     margin-left: 0px;
-    background: #373a3c !important;
     border-left: 1px solid #55595c;
     border-right: 1px solid #55595c;
     padding-top: 0px !important;
     padding-bottom: 0px !important;
     margin-top: 0px !important;
 }
-.dropdown-menu > li {
-    background: #434749 !important;
-    border-bottom: 1px solid #55595c;
-}
-
-.dropdown-menu > li > a > span {
-    background: #434749 !important;
-    font-size: 13px !important;
-    line-height: 30px !important;
-    color: #f0f0f0;
-    padding-left: 10px;
-}
-
-.dropdown-menu > .active {
-    background: #55595c !important;
-}
-
-.dropdown-menu > .active > a > span {
-    background: #55595c !important;
-}
-.dropdown-menu {
-    background: red !important;
-}