diff --git a/common/css/bootstrap.min.css b/common/css/bootstrap.min.css index 5b54e5f0ceccb..97ee2184af415 100644 --- a/common/css/bootstrap.min.css +++ b/common/css/bootstrap.min.css @@ -645,7 +645,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav>.disabled>a{color:#4d4d4d;} .nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;background-color:transparent;cursor:default;} .navbar{overflow:visible;margin-bottom:20px;*position:relative;*z-index:2;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#2e2e2e;background-image:-moz-linear-gradient(top, #333333, #262626);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#262626));background-image:-webkit-linear-gradient(top, #333333, #262626);background-image:-o-linear-gradient(top, #333333, #262626);background-image:linear-gradient(to bottom, #333333, #262626);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff333333', endColorstr='#ff262626', GradientType=0);border:1px solid #080808;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} +.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#2e2e2e;background-image:-moz-linear-gradient(top, #404040, #262626);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#404040), to(#262626));background-image:-webkit-linear-gradient(top, #404040, #262626);background-image:-o-linear-gradient(top, #404040, #262626);background-image:linear-gradient(to bottom, #404040, #262626);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff404040', endColorstr='#ff262626', GradientType=0);border:1px solid #080808;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} .navbar-inner:after{clear:both;} .navbar .container{width:auto;} .nav-collapse.collapse{height:auto;overflow:visible;} diff --git a/common/css/main.css b/common/css/main.css index bb53d3f6704b8..b23868f2ea733 100644 --- 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 index 5a23ff69de6fe..a51cb13e004e5 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@ -
+
diff --git a/js/controllers.js b/js/controllers.js index 445aa9b8e545e..197b48b3ed2c8 100644 --- 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,7 +100,7 @@ angular.module('kibana.controllers', []) _.defaults($scope.row,_d) - $scope.init = function(){ + $scope.init = function() { $scope.reset_panel(); } @@ -104,7 +108,7 @@ angular.module('kibana.controllers', []) 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 index 0b68fd0c424a0..d1f2ef91c1684 100644 --- 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 index 3e5151af2c9c5..f435908f251c2 100644 --- 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 index 625203f72266c..fb8cdd779638c 100644 --- 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 index a4e3bcc10d244..0d9f5ba16bf78 100644 --- a/partials/dashboard.html +++ b/partials/dashboard.html @@ -2,7 +2,7 @@
-
+