apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for empty row height again, and some visual tweaks, colors

Browse Source
pull/7/head
Rashid Khan 12 years ago
parent eb5514911b
commit 890a10df8d
8 changed files with 31 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      common/css/bootstrap.min.css
  2. 8
      common/css/main.css
  3. 2
      index.html
  4. 16
      js/controllers.js
  5. 10
      panels/histogram/module.js
  6. 2
      panels/hits/module.js
  7. 2
      panels/pie/module.js
  8. 2
      partials/dashboard.html

2
common/css/bootstrap.min.css vendored
Unescape View File

@ -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;}

8
common/css/main.css
Unescape View File

@ -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;

2
index.html
Unescape View File

@ -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>

16
js/controllers.js
Unescape View File

@ -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'],
};
};

10
panels/histogram/module.js
Unescape View File

@ -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

2
panels/hits/module.js
Unescape View File

@ -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

2
panels/pie/module.js
Unescape View File

@ -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

2
partials/dashboard.html
Unescape View File

@ -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">

Write Preview
Loading…
Cancel
Save