Skip to content

N
nexpie-grafana-theme
Commit dd15b2c2 by Rashid Khan
Options

Merge pull request #39 from rashidkpc/master 

fix wrong height on rows
parents b8290305 890a10df
Showing with 31 additions and 13 deletions
common/css/bootstrap.min.css
...@@ -645,7 +645,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- ...@@ -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{color:#4d4d4d;}
.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;background-color:transparent;cursor:default;} .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{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-inner:after{clear:both;}
.navbar .container{width:auto;} .navbar .container{width:auto;}
.nav-collapse.collapse{height:auto;overflow:visible;} .nav-collapse.collapse{height:auto;overflow:visible;}
......
common/css/main.css
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
color: #000; 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 { .kibana-row {
margin-left: 15px; margin-left: 15px;
margin-bottom: 15px; margin-bottom: 15px;
...@@ -15,6 +19,10 @@ ...@@ -15,6 +19,10 @@
color: #eee; color: #eee;
} }
.navbar-inner {
border-width: 0 0 0px;
}
.row-close { .row-close {
color: #bbb; color: #bbb;
position: absolute; position: absolute;
......
index.html
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid"> <div class="container-fluid main">
<div class="row-fluid"> <div class="row-fluid">
<div ng-view></div> <div ng-view></div>
</div> </div>
......
js/controllers.js
...@@ -48,6 +48,10 @@ angular.module('kibana.controllers', []) ...@@ -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) { $scope.alert = function(title,text,severity,timeout) {
var alert = { var alert = {
title: title, title: title,
...@@ -96,7 +100,7 @@ angular.module('kibana.controllers', []) ...@@ -96,7 +100,7 @@ angular.module('kibana.controllers', [])
_.defaults($scope.row,_d) _.defaults($scope.row,_d)
$scope.init = function(){ $scope.init = function() {
$scope.reset_panel(); $scope.reset_panel();
} }
...@@ -104,7 +108,7 @@ angular.module('kibana.controllers', []) ...@@ -104,7 +108,7 @@ angular.module('kibana.controllers', [])
row.collapse = row.collapse ? false : true; row.collapse = row.collapse ? false : true;
if (!row.collapse) { if (!row.collapse) {
$timeout(function() { $timeout(function() {
$scope.send_render(); $scope.$broadcast('render')
}); });
} }
} }
...@@ -120,11 +124,11 @@ angular.module('kibana.controllers', []) ...@@ -120,11 +124,11 @@ angular.module('kibana.controllers', [])
$scope.reset_panel = function() { $scope.reset_panel = function() {
$scope.panel = { $scope.panel = {
loading: false, loading : false,
error: false, error : false,
span: 3, span : 3,
editable: true, editable: true,
group: ['default'], group : ['default'],
}; };
}; };
......
panels/histogram/module.js
...@@ -235,7 +235,7 @@ angular.module('kibana.histogram', []) ...@@ -235,7 +235,7 @@ angular.module('kibana.histogram', [])
steps: false steps: false
}, },
bars: { show: scope.panel.bars, fill: 1, barWidth: barwidth/1.8 }, 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 shadowSize: 1
}, },
yaxis: { show: scope.panel['y-axis'], min: 0, color: "#000" }, yaxis: { show: scope.panel['y-axis'], min: 0, color: "#000" },
...@@ -258,7 +258,13 @@ angular.module('kibana.histogram', []) ...@@ -258,7 +258,13 @@ angular.module('kibana.histogram', [])
color: "#eee", color: "#eee",
hoverable: true, hoverable: true,
}, },
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F'] colors: ['#86B22D',
'#BF6730',
'#1D7373',
'#BFB930',
'#BF3030',
'#77207D'
]
}) })
// Work around for missing legend at initialization // Work around for missing legend at initialization
......
panels/hits/module.js
...@@ -165,7 +165,7 @@ angular.module('kibana.hits', []) ...@@ -165,7 +165,7 @@ angular.module('kibana.hits', [])
color: "#eee", color: "#eee",
hoverable: true, hoverable: true,
}, },
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F'] colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
}) })
// Work around for missing legend at initialization // Work around for missing legend at initialization
......
panels/pie/module.js
...@@ -269,7 +269,7 @@ angular.module('kibana.pie', []) ...@@ -269,7 +269,7 @@ angular.module('kibana.pie', [])
//grid: { hoverable: true, clickable: true }, //grid: { hoverable: true, clickable: true },
grid: { hoverable: true, clickable: true }, grid: { hoverable: true, clickable: true },
legend: { show: false }, legend: { show: false },
colors: ['#EB6841','#00A0B0','#6A4A3C','#EDC951','#CC333F'] colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
}; };
// Populate element // Populate element
......
partials/dashboard.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="row-fluid container" style="margin-top:10px"> <div class="row-fluid container" style="margin-top:10px">
<!-- Rows --> <!-- Rows -->
<div ng-controller="dashcontrol" ng-init="init()"></div> <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-control">
<div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px"> <div class="row-fluid row-header" style="padding:0px;margin:0px;height:0px">
<div style="vertical-align:bottom"> <div style="vertical-align:bottom">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment