From 94415e2b6066b8c3ea9c2b4c8ff21d61156cad4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 18 Mar 2015 19:42:18 -0400
Subject: [PATCH] Fix for panel height in fullscreen mode

---
 src/app/features/panel/panelDirective.js | 4 ++--
 src/app/partials/dasheditor.html         | 1 -
 src/css/less/variables.dark.less         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/features/panel/panelDirective.js b/src/app/features/panel/panelDirective.js
index f8048d53637..7330bb627de 100644
--- a/src/app/features/panel/panelDirective.js
+++ b/src/app/features/panel/panelDirective.js
@@ -30,8 +30,8 @@ function (angular, $, config) {
         link: function(scope, elem) {
           var panelContainer = elem.find('.panel-container');
 
-          scope.$watchGroup(['fullscreen', 'panel.height', 'row.height'], function() {
-            panelContainer.css({ minHeight: scope.panel.height || scope.row.height, display: 'block' });
+          scope.$watchGroup(['fullscreen', 'height', 'panel.height', 'row.height'], function() {
+            panelContainer.css({ minHeight: scope.height || scope.panel.height || scope.row.height, display: 'block' });
             elem.toggleClass('panel-fullscreen', scope.fullscreen ? true : false);
           });
         }
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html
index a9de9af2acb..e6ab6070f9f 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -31,7 +31,6 @@
 					</div>
 					<editor-opt-bool text="Hide controls (CTRL+H)" model="dashboard.hideControls"></editor-opt-bool>
           <editor-opt-bool text="Shared Crosshair (CTRL+O)" model="dashboard.sharedCrosshair"></editor-opt-bool>
-					<editor-opt-bool text="Editable" model="dashboard.editable"></editor-opt-bool>
 				</div>
 			</div>
 			<div class="editor-row">
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 6aab758ad82..9a7613ff311 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -28,7 +28,7 @@
 // grafana Variables
 // -------------------------
 @grafanaPanelBackground: 	@grayDarker;
-@grafanaPanelBorder: 		solid 1px @grayDark;
+@grafanaPanelBorder: 		  solid 1px @grayDark;
 @grafanaTriggerBorder:		solid 1px #555;
 
 // Graphite Target Editor