From 5cd73cea4b7d069268ff22ee0d1a9b81c7c6a000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 5 Apr 2014 16:56:45 +0200
Subject: [PATCH] small code cleanup in grafanaGraph

---
 src/app/directives/grafanaGraph.js | 10 +++++++++-
 src/css/less/overrides.less        |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index 251da8ff3af..8aa9ea9a531 100644
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -45,7 +45,15 @@ function (angular, $, kbn, moment, _) {
 
         function setElementHeight() {
           try {
-            elem.css({ height: scope.height || scope.panel.height || scope.row.height });
+            var height = scope.height || scope.panel.height || scope.row.height;
+            height = height.replace('px', '') - 32; // subtract panel title bar
+
+            if (scope.panel.legend.show) {
+              height = height - 35; // subtract one line legend
+            }
+
+            elem.css('height', height + 'px');
+
             return true;
           } catch(e) { // IE throws errors sometimes
             return false;
diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less
index 42ae76f3b9f..bfdf7f6fa2d 100644
--- a/src/css/less/overrides.less
+++ b/src/css/less/overrides.less
@@ -77,7 +77,7 @@ code, pre {
 }
 
 .panel-content {
-  padding: 0px 10px 10px 10px;
+  padding: 0px 10px 0 10px;
 }
 
 .panel-title {