Merge pull request #39 from rashidkpc/master

fix wrong height on rows
elastic · Apr 10, 2013 · dd15b2c · dd15b2c
2 parents b829030 + 890a10d
commit dd15b2c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/common/css/bootstrap.min.css b/common/css/bootstrap.min.css
diff --git a/common/css/main.css b/common/css/main.css
@@ -6,6 +6,10 @@
   color: #000;
 }
 
+.main {
+  box-shadow:0 3px 5px rgba(0, 0, 0, 0.4) inset, 0 -3px 5px rgba(0, 0, 0, 0.4) inset;
+}
+
 .kibana-row {
   margin-left: 15px;
   margin-bottom: 15px;
@@ -15,6 +19,10 @@
   color: #eee;
 }
 
+.navbar-inner {
+    border-width: 0 0 0px;
+}
+
 .row-close {
   color: #bbb;  
   position: absolute;

diff --git a/index.html b/index.html
@@ -42,7 +42,7 @@
       </div>
     </div>
   </div>
-  <div class="container-fluid">
+  <div class="container-fluid main">
     <div class="row-fluid">
       <div ng-view></div>
     </div>

diff --git a/js/controllers.js b/js/controllers.js
@@ -48,6 +48,10 @@ angular.module('kibana.controllers', [])
     };
   };
 
+  $scope.row_style = function(row) {
+    return { 'min-height': row.collapse ? '5px' : row.height }
+  }
+
   $scope.alert = function(title,text,severity,timeout) {
     var alert = {
       title: title,
@@ -96,15 +100,15 @@ angular.module('kibana.controllers', [])
   _.defaults($scope.row,_d)
 
 
-  $scope.init = function(){
+  $scope.init = function() {
     $scope.reset_panel();
   }
 
   $scope.toggle_row = function(row) {
     row.collapse = row.collapse ? false : true;
     if (!row.collapse) {
       $timeout(function() {
-        $scope.send_render();
+        $scope.$broadcast('render')
       });
     }
   }
@@ -120,11 +124,11 @@ angular.module('kibana.controllers', [])
 
   $scope.reset_panel = function() {
     $scope.panel = {
-      loading: false,
-      error: false,
-      span: 3,
+      loading : false,
+      error   : false,
+      span    : 3,
       editable: true,
-      group: ['default'],
+      group   : ['default'],
     };
   };
 

diff --git a/panels/histogram/module.js b/panels/histogram/module.js
@@ -235,7 +235,7 @@ angular.module('kibana.histogram', [])
                   steps: false
                 },
                 bars:   { show: scope.panel.bars,  fill: 1, barWidth: barwidth/1.8 },
-                points: { show: scope.panel.points, fill: 1, fillColor: false},
+                points: { show: scope.panel.points, fill: 1, fillColor: false, radius: 5},
                 shadowSize: 1
               },
               yaxis: { show: scope.panel['y-axis'], min: 0, color: "#000" },
@@ -258,7 +258,13 @@ angular.module('kibana.histogram', [])
                 color: "#eee",
                 hoverable: true,
               },
-              colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
+              colors: ['#86B22D',
+                      '#BF6730',
+                      '#1D7373',
+                      '#BFB930',
+                      '#BF3030',
+                      '#77207D'
+                      ]
             })
 
             // Work around for missing legend at initialization

diff --git a/panels/hits/module.js b/panels/hits/module.js
@@ -165,7 +165,7 @@ angular.module('kibana.hits', [])
                 color: "#eee",
                 hoverable: true,
               },
-              colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
+              colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
             })
 
             // Work around for missing legend at initialization

diff --git a/panels/pie/module.js b/panels/pie/module.js
@@ -269,7 +269,7 @@ angular.module('kibana.pie', [])
           //grid: { hoverable: true, clickable: true },
           grid:   { hoverable: true, clickable: true },
           legend: { show: false },
-          colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F']
+          colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
         };
 
         // Populate element

diff --git a/partials/dashboard.html b/partials/dashboard.html
@@ -2,7 +2,7 @@
 <div class="row-fluid container" style="margin-top:10px">
   <!-- Rows -->
   <div ng-controller="dashcontrol" ng-init="init()"></div>
-  <div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboards.rows" style="min-height:{{row.height}};">
+  <div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboards.rows" ng-style="row_style(row)">
     <div class="row-control">
       <div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
         <div style="vertical-align:bottom">