From 6c83699e6f33d4b13d05ae407a23516aaef997bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 20 Oct 2014 12:14:58 -0400 Subject: [PATCH] Panel: css fix for panel fullscreen/edit mode for latest chrome 38 and Firefox 33, #954 --- src/app/dashboards/default.json | 1 - src/app/dashboards/scripted.js | 11 +++++++++++ src/app/dashboards/template_vars.json | 1 - src/app/panels/graph/module.js | 4 ---- src/css/less/grafana.less | 8 +++++--- src/css/less/submenu.less | 2 +- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index 241e663d5ea..931d4c6f802 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -101,7 +101,6 @@ "legend_counts": true, "timezone": "browser", "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/dashboards/scripted.js b/src/app/dashboards/scripted.js index b8f428a9834..f4a438b7854 100644 --- a/src/app/dashboards/scripted.js +++ b/src/app/dashboards/scripted.js @@ -68,6 +68,17 @@ for (var i = 0; i < rows; i++) { 'target': "randomWalk('random walk2')" } ], + seriesOverrides: [ + { + alias: '/random/', + yaxis: 2, + fill: 0, + linewidth: 5 + } + ], + tooltip: { + shared: true + } } ] }); diff --git a/src/app/dashboards/template_vars.json b/src/app/dashboards/template_vars.json index affe7727ce2..43e9e37836c 100644 --- a/src/app/dashboards/template_vars.json +++ b/src/app/dashboards/template_vars.json @@ -65,7 +65,6 @@ "avg": false }, "percentage": false, - "zerofill": true, "nullPointMode": "connected", "steppedLine": false, "tooltip": { diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js index a1dbc942553..54a2a028fe6 100644 --- a/src/app/panels/graph/module.js +++ b/src/app/panels/graph/module.js @@ -151,10 +151,6 @@ function (angular, app, $, _, kbn, moment, TimeSeries) { * queries */ percentage : false, - /** @scratch /panels/histogram/3 - * zerofill:: Improves the accuracy of line charts at a small performance cost. - */ - zerofill : true, nullPointMode : 'connected', diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 1f676b97531..668feefdef0 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -115,7 +115,7 @@ position: fixed; left: 0px; right: 0px; - top: 54px; + top: 51px; height: 100%; padding: 0 10px; background: @grafanaPanelBackground; @@ -133,9 +133,11 @@ .dashboard-fullscreen { .main-view-container { - height: 0; overflow: hidden; - padding: 0; + height: 0; + .row-control-inner { + display: none; + } } } diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less index b762d7acfbd..52bd1c81e92 100644 --- a/src/css/less/submenu.less +++ b/src/css/less/submenu.less @@ -1,6 +1,6 @@ .submenu-controls-visible:not(.hide-controls) { .panel-fullscreen { - top: 91px; + top: 88px; } }