From c78f1834bd03894336a10b0c6b7580033ef051d1 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Fri, 15 Dec 2017 11:01:18 +0100
Subject: [PATCH] changed background color for infobox and new blues in light
 theme, light theme now uses blue-dark in panel query (#10211)

---
 public/sass/_variables.dark.scss          |  5 ++++-
 public/sass/_variables.light.scss         | 10 ++++++----
 public/sass/base/_type.scss               |  2 +-
 public/sass/components/_infobox.scss      |  4 ++++
 public/sass/components/_query_editor.scss |  6 +++---
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index e1015a39c13..60f25152db6 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -44,6 +44,8 @@ $brand-success:         $green;
 $brand-warning:         $brand-primary;
 $brand-danger:          $red;
 
+$query-blue:            $blue;
+
 // Status colors
 // -------------------------
 $online:                #10a345;
@@ -316,7 +318,8 @@ $graph-tooltip-bg:        $dark-1;
 $checkboxImageUrl: '../img/checkbox.png';
 
 // info box
-$info-box-background: linear-gradient(100deg, #1a4552, #00374a);
+$info-box-background: linear-gradient(100deg, $blue-dark, darken($blue-dark, 5%));
+$info-box-color:      $gray-4;
 
 // footer
 $footer-link-color:   $gray-2;
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 0570b6a6e85..f48b38867c7 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -31,8 +31,8 @@ $white:            #fff;
 
 // Accent colors
 // -------------------------
-$blue:                  #1ca4d6;
-$blue-dark:             #3CAAD6;
+$blue:                  #61c2f2;
+$blue-dark:             #0083b3;
 $green:                 #3aa655;
 $red:                   #d44939;
 $yellow:                #FF851B;
@@ -46,6 +46,8 @@ $brand-success:         $green;
 $brand-warning:         $orange;
 $brand-danger:          $red;
 
+$query-blue:            $blue-dark;
+
 // Status colors
 // -------------------------
 $online:                #01A64F;
@@ -329,8 +331,8 @@ $graph-tooltip-bg:        $gray-5;
 $checkboxImageUrl: '../img/checkbox_white.png';
 
 // info box
-// $info-box-background: linear-gradient(135deg, #f1fbff, #d7ebff);
-$info-box-background: linear-gradient(135deg, $blue, $blue-dark);
+$info-box-background: linear-gradient(100deg, $blue-dark, darken($blue-dark, 5%));
+$info-box-color:      $gray-7;
 
 // footer
 $footer-link-color:   $gray-3;
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index 1d2fed48830..13cc278fce2 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -279,7 +279,7 @@ address {
 }
 
 a.external-link {
-  color: $blue;
+  color:  $external-link-color;
   text-decoration: underline;
 }
 
diff --git a/public/sass/components/_infobox.scss b/public/sass/components/_infobox.scss
index 2a9c03cbdfa..bf70f8548e5 100644
--- a/public/sass/components/_infobox.scss
+++ b/public/sass/components/_infobox.scss
@@ -7,6 +7,10 @@
   margin-bottom: $spacer;
   margin-right: $gf-form-margin;
   flex-grow: 1;
+  color: $info-box-color;
+    h5 {
+      color: $info-box-color;
+    }
 
   h5 {
     margin-bottom: $spacer;
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index 66c029071b2..aa9a1da679b 100644
--- a/public/sass/components/_query_editor.scss
+++ b/public/sass/components/_query_editor.scss
@@ -1,11 +1,11 @@
 .query-keyword {
   font-weight: $font-weight-semi-bold;
-  color: $blue;
+  color: $query-blue;
 }
 
 .gf-form-disabled {
   .query-keyword {
-    color: darken($blue, 20%);
+    color: darken($query-blue, 20%);
   }
 }
 
@@ -63,7 +63,7 @@
   }
   .gf-form-query-letter-cell-letter {
     font-weight: bold;
-    color: $blue;
+    color: $query-blue;
   }
   .gf-form-query-letter-cell-ds {
     color: $text-color-weak;