From 381b9ee7ee89bec5ac14223e78f597e4cc503031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 11 Nov 2014 07:51:52 +0100 Subject: [PATCH] Graph: legend css tweaks --- src/app/panels/graph/legend.js | 12 ++++++------ src/css/less/graph.less | 10 +++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/panels/graph/legend.js b/src/app/panels/graph/legend.js index 393e5d3dff4..af695d28f2b 100644 --- a/src/app/panels/graph/legend.js +++ b/src/app/panels/graph/legend.js @@ -90,7 +90,7 @@ function (angular, app, _, kbn, $) { html += ''; html += ''; - html += '
'; + html += '
'; html += '' + series.label + ''; html += '
'; @@ -101,11 +101,11 @@ function (angular, app, _, kbn, $) { var total = series.formatValue(series.stats.total); if (panel.legend.values) { - if (panel.legend.min) { html += '
' + min + '
'; } - if (panel.legend.max) { html += '
' + max + '
'; } - if (panel.legend.avg) { html += '
' + avg + '
'; } - if (panel.legend.current) { html += '
' + current + '
'; } - if (panel.legend.total) { html += '
' + total + '
'; } + if (panel.legend.min) { html += '
' + min + '
'; } + if (panel.legend.max) { html += '
' + max + '
'; } + if (panel.legend.avg) { html += '
' + avg + '
'; } + if (panel.legend.current) { html += '
' + current + '
'; } + if (panel.legend.total) { html += '
' + total + '
'; } } html += '
'; diff --git a/src/css/less/graph.less b/src/css/less/graph.less index 438cb5d2379..ad32e25c4ca 100644 --- a/src/css/less/graph.less +++ b/src/css/less/graph.less @@ -18,12 +18,12 @@ top: 1px; } -.graph-legend-series, .graph-legend-icon, .graph-legend-alias, .graph-legend-value { float: left; white-space: nowrap; + font-size: 85%; text-align: left; &.current:before { content: "Current: " @@ -43,6 +43,8 @@ } .graph-legend-series { + float: left; + white-space: nowrap; padding-left: 10px; padding-top: 6px; } @@ -110,7 +112,8 @@ text-align: right; padding: 5px 10px; font-weight: bold; - color: @blue + color: @blue; + font-size: 85%; } } @@ -131,7 +134,8 @@ display: table-cell; vertical-align: top; position: relative; - left: -4px; + left: 4px; + top: -20px; } .graph-legend {