From dc22beadcad91eb85175e79a61181f99a5eecc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 13 Dec 2018 16:02:14 +0100
Subject: [PATCH] wip: style change progress

---
 packaging/publish/publish_both.sh         | 22 +++++++++++-----------
 public/sass/_variables.dark.scss          |  3 +++
 public/sass/_variables.light.scss         |  3 +++
 public/sass/components/_panel_editor.scss |  8 +++++---
 public/sass/components/_tabbed_view.scss  |  2 +-
 5 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/packaging/publish/publish_both.sh b/packaging/publish/publish_both.sh
index b1d480567e9..b86c20011e0 100755
--- a/packaging/publish/publish_both.sh
+++ b/packaging/publish/publish_both.sh
@@ -1,17 +1,17 @@
 #! /usr/bin/env bash
-version=5.4.1
+version=5.4.2
 
-wget https://dl.grafana.com/oss/release/grafana_${version}_amd64.deb
+# wget https://dl.grafana.com/oss/release/grafana_${version}_amd64.deb
+#
+# package_cloud push grafana/stable/debian/jessie grafana_${version}_amd64.deb
+# package_cloud push grafana/stable/debian/wheezy grafana_${version}_amd64.deb
+# package_cloud push grafana/stable/debian/stretch grafana_${version}_amd64.deb
+#
+# package_cloud push grafana/testing/debian/jessie grafana_${version}_amd64.deb
+# package_cloud push grafana/testing/debian/wheezy grafana_${version}_amd64.deb --verbose
+# package_cloud push grafana/testing/debian/stretch grafana_${version}_amd64.deb --verbose
 
-package_cloud push grafana/stable/debian/jessie grafana_${version}_amd64.deb
-package_cloud push grafana/stable/debian/wheezy grafana_${version}_amd64.deb
-package_cloud push grafana/stable/debian/stretch grafana_${version}_amd64.deb
-
-package_cloud push grafana/testing/debian/jessie grafana_${version}_amd64.deb
-package_cloud push grafana/testing/debian/wheezy grafana_${version}_amd64.deb --verbose
-package_cloud push grafana/testing/debian/stretch grafana_${version}_amd64.deb --verbose
-
-wget https://dl.grafana.com/release/grafana-${version}-1.x86_64.rpm
+wget https://dl.grafana.com/oss/release/grafana-${version}-1.x86_64.rpm
 
 package_cloud push grafana/testing/el/6 grafana-${version}-1.x86_64.rpm --verbose
 package_cloud push grafana/testing/el/7 grafana-${version}-1.x86_64.rpm --verbose
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index e2c350ff220..cab0eb76dde 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -387,6 +387,9 @@ $panel-editor-tabs-line-color: #e3e3e3;
 $panel-editor-viz-item-bg-hover: darken($blue, 47%);
 $panel-editor-viz-item-bg-hover-active: darken($orange, 45%);
 
+$panel-option-section-border: 1px solid $dark-3;
+$panel-option-section-header-bg: linear-gradient(0deg, $gray-blue, $dark-1);
+
 $panel-grid-placeholder-bg: darken($blue, 47%);
 $panel-grid-placeholder-shadow: 0 0 4px $blue;
 
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 657e9eb3509..336c35ab13d 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -396,6 +396,9 @@ $panel-editor-tabs-line-color: $dark-5;
 $panel-editor-viz-item-bg-hover: lighten($blue, 62%);
 $panel-editor-viz-item-bg-hover-active: lighten($orange, 34%);
 
+$panel-option-section-border: 1px solid $gray-6;
+$panel-option-section-header-bg: linear-gradient(0deg, $gray-6, $gray-7);
+
 $panel-grid-placeholder-bg: lighten($blue, 62%);
 $panel-grid-placeholder-shadow: 0 0 4px $blue-light;
 
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 7195d0c181a..f07597b9400 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -244,12 +244,14 @@
 
 .panel-option-section {
   margin-bottom: 10px;
+  border: $panel-option-section-border;
+  border-radius: $border-radius;
 }
 
 .panel-option-section__header {
-  padding: 5px 20px;
-  font-size: $font-size-h5;
-  background: $input-label-bg;
+  padding: 4px 20px;
+  font-size: 1.1rem;
+  background: $panel-option-section-header-bg;
   position: relative;
 
   .btn {
diff --git a/public/sass/components/_tabbed_view.scss b/public/sass/components/_tabbed_view.scss
index c1cf78716bb..ef21d54f71c 100644
--- a/public/sass/components/_tabbed_view.scss
+++ b/public/sass/components/_tabbed_view.scss
@@ -58,6 +58,6 @@
 }
 
 .section-heading {
-  font-size: 1.1rem;
+  font-size: $font-size-md;
   margin-bottom: 0.6rem;
 }