From f8b1484265d06b5cc2f5fba41af2c9a33e3f8742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 22 Nov 2018 15:34:55 +0100
Subject: [PATCH] minor style changes

---
 public/sass/_variables.dark.scss          | 5 ++---
 public/sass/_variables.light.scss         | 5 ++---
 public/sass/components/_panel_editor.scss | 4 ++--
 public/sass/components/_toolbar.scss      | 5 ++---
 public/sass/layout/_page.scss             | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index cdd5fc46ad6..43aa7df7683 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -79,6 +79,7 @@ $brand-gradient: linear-gradient(
 );
 
 $page-gradient: linear-gradient(180deg, #222426 10px, rgb(22, 23, 25) 100px);
+$edit-gradient: linear-gradient(180deg, #222426 10px, rgb(22, 23, 25) 00px, #090909 50%);
 
 // Links
 // -------------------------
@@ -268,9 +269,7 @@ $menu-dropdown-shadow: 5px 5px 20px -5px $black;
 $tab-border-color: $dark-4;
 
 // Toolbar
-$toolbar-bg: $page-header-bg;
-$toolbar-shadow: 0 0 20px black;
-$toolbar-tab-bg: $gray-blue;
+$toolbar-bg: $black;
 
 // Pagination
 // -------------------------
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 4e3c8fc3bd6..806aae353c3 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -76,6 +76,7 @@ $textShadow: none;
 // gradients
 $brand-gradient: linear-gradient(to right, rgba(255, 213, 0, 1) 0%, rgba(255, 68, 0, 1) 99%, rgba(255, 68, 0, 1) 100%);
 $page-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);
+$edit-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);
 
 // Links
 // -------------------------
@@ -215,9 +216,7 @@ $menu-dropdown-shadow: 5px 5px 10px -5px $gray-1;
 $tab-border-color: $gray-5;
 
 // Toolbar
-$toolbar-bg: linear-gradient(90deg, #ffffff, #e6eef9);
-$toolbar-shadow: 1px 1px 3px #c7d0d8;
-$toolbar-tab-bg: $white;
+$toolbar-bg: white;
 
 // search
 $search-shadow: 0 5px 30px 0 $gray-4;
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 907fa0ce44e..656c1eb429b 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -25,7 +25,7 @@
   margin-top: $panel-margin*2;
   display: flex;
   flex-direction: row;
-  height: 65%;
+  height: 60%;
   position: relative;
 }
 
@@ -34,7 +34,7 @@
   flex-direction: column;
   flex-grow: 1;
   background: $page-bg;
-  margin: 0 67px;
+  margin: 0 62px;
   border-left: 2px solid #ac5224;
   border-radius: 3px;
 }
diff --git a/public/sass/components/_toolbar.scss b/public/sass/components/_toolbar.scss
index ca81a6a7316..6eb4e4f7e7f 100644
--- a/public/sass/components/_toolbar.scss
+++ b/public/sass/components/_toolbar.scss
@@ -6,14 +6,13 @@
   position: relative;
   z-index: 1;
   flex: 0 0 auto;
-  background: $black;
-  border-bottom: 1px solid $black;
+  background: $toolbar-bg;
   border-radius: 3px;
 }
 
 .toolbar__heading {
   font-size: $font-size-lg;
-  padding-right: 10px;
+  padding-right: 20px;
 }
 
 .toolbar__main {
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 4655c73b48d..02f21ab96bd 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -16,7 +16,7 @@
 
 .panel-in-fullscreen {
   .main-view {
-    background: linear-gradient(180deg, #222426 10px, #090909 200px);
+    background: $edit-gradient;
   }
 }