From ac45ccbad75b90ee289147584978af8768487159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 21 Feb 2016 08:51:01 +0100
Subject: [PATCH] fix(panel): fixed text panel issue due to recent style
 changes, fixes #4095

---
 public/app/plugins/panel/text/editor.html | 39 ++++++++++++++---------
 public/app/plugins/panel/text/module.html |  3 +-
 public/sass/_grafana.scss                 |  1 +
 public/sass/base/_forms.scss              |  1 +
 public/sass/components/_panel_text.scss   |  6 ++++
 5 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 public/sass/components/_panel_text.scss

diff --git a/public/app/plugins/panel/text/editor.html b/public/app/plugins/panel/text/editor.html
index 2fefb438e7e..357becff5fd 100644
--- a/public/app/plugins/panel/text/editor.html
+++ b/public/app/plugins/panel/text/editor.html
@@ -1,17 +1,26 @@
-<div>
-  <div class="row-fluid">
-    <div class="span4">
-      <label class="small">Mode</label> <select class="input-medium" ng-model="ctrl.panel.mode" ng-options="f for f in ['html','markdown','text']"></select>
-    </div>
-    <div class="span2" ng-show="ctrl.panel.mode == 'text'">
-      <label class="small">Font Size</label> <select class="input-mini" ng-model="ctrl.panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
-    </div>
-  </div>
+<div class="gf-form-group">
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<span class="gf-form-label">Mode</span>
+			<span class="gf-form-select-wrapper">
+				<select class="gf-form-input" ng-model="ctrl.panel.mode" ng-options="f for f in ['html','markdown','text']"></select>
+			</span>
+		</div>
 
-  <label class=small>Content
-    <span ng-show="ctrl.panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span>
-  </label>
-
-  <textarea ng-model="ctrl.panel.content" rows="20" style="width:95%" ng-change="ctrl.render()" ng-model-onblur>
-  </textarea>
+		<div class="gf-form" ng-show="ctrl.panel.mode == 'text'">
+			<span class="gf-form-label">Font Size</span>
+			<span class="gf-form-select-wrapper">
+				<select class="gf-form-input" ng-model="ctrl.panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
+			</span>
+		</div>
+	</div>
 </div>
+
+<h3 class="page-heading">Content</h3>
+
+<span ng-show="ctrl.panel.mode == 'markdown'">
+	(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)
+</span>
+
+<textarea class="gf-form-input" ng-model="ctrl.panel.content" rows="20" style="width:95%" ng-change="ctrl.render()" ng-model-onblur>
+</textarea>
diff --git a/public/app/plugins/panel/text/module.html b/public/app/plugins/panel/text/module.html
index 12a02597384..4ed7806753d 100644
--- a/public/app/plugins/panel/text/module.html
+++ b/public/app/plugins/panel/text/module.html
@@ -1 +1,2 @@
-<p ng-bind-html="ctrl.content" ng-show="ctrl.content"></p>
+<p class="panel-text-content" ng-bind-html="ctrl.content" ng-show="ctrl.content">
+</p>
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index 463b83f23a1..a412919ef25 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -40,6 +40,7 @@
 @import "components/panel_dashlist";
 @import "components/panel_singlestat";
 @import "components/panel_table";
+@import "components/panel_text";
 @import "components/tagsinput";
 @import "components/tables_lists";
 @import "components/search";
diff --git a/public/sass/base/_forms.scss b/public/sass/base/_forms.scss
index 25a95fafde8..79edd3591f9 100644
--- a/public/sass/base/_forms.scss
+++ b/public/sass/base/_forms.scss
@@ -32,6 +32,7 @@ input,
 button,
 select,
 textarea {
+  background-color: $input-bg;
   @include font-shorthand($font-size-base,normal,$line-height-base); // Set size, weight, line-height here
 }
 input,
diff --git a/public/sass/components/_panel_text.scss b/public/sass/components/_panel_text.scss
new file mode 100644
index 00000000000..06d3495aaa0
--- /dev/null
+++ b/public/sass/components/_panel_text.scss
@@ -0,0 +1,6 @@
+
+.panel-text-content {
+  ul {
+    margin: 0 0 $spacer $spacer * 1.5;
+  }
+}