From 5a67ca255fd896bdf9ffe2b6fd045db5b962da3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 16 Feb 2016 15:03:33 +0100
Subject: [PATCH] ux(): fixes to light theme

---
 .../app/features/dashboard/timepicker/timepicker.html |  2 +-
 public/sass/_variables.light.scss                     | 11 ++++++-----
 public/sass/_variables.scss                           |  2 +-
 public/sass/base/_type.scss                           |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html
index 008f4a149ce..609b5905983 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -1,6 +1,6 @@
 <ul class="nav gf-timepicker-nav">
 
-	<li class="dashnav-zoom-out" style="padding-top: 4px">
+	<li class="dashnav-zoom-out" style="padding-top: 2px">
 		<a class='small' ng-click='ctrl.zoom(2)'>
 			Zoom Out
 		</a>
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index a1cbaf63798..8d0e133f168 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -15,6 +15,7 @@ $gray-dark:             lighten(#000, 20%);   // #333
 $gray:                  lighten(#000, 33.5%); // #555
 $gray-light:            lighten(#000, 60%);   // #999
 $gray-lighter:          lighten(#000, 97.5%); // #eee
+$gray-lightest:         lighten(#000, 98.5%); // #eee
 $white:                 #fff;
 
 
@@ -44,10 +45,10 @@ $critical:              #EC2128;
 // Scaffolding
 // -------------------------
 
-$body-bg:  		rgb(20,20,20);
-$page-bg:  		$gray-darker;
-$body-color:    $gray-lighter;
-$text-color:    $gray-lighter;
+$body-bg:  		  #EFEFEF;
+$page-bg:  		  $gray-lightest;
+$body-color:    $gray;
+$text-color:    $gray;
 
 // Links
 // -------------------------
@@ -73,7 +74,7 @@ $component-active-bg:    $brand-primary !default;
 // Panel
 // -------------------------
 
-$panel-bg: 		  $gray-lighter;
+$panel-bg: 		    $gray-lighter;
 $panel-border: 	  solid 1px #ddd;
 
 $divider-border-color: 		$gray-light;
diff --git a/public/sass/_variables.scss b/public/sass/_variables.scss
index ae954d40c0a..0a643f0a0a2 100644
--- a/public/sass/_variables.scss
+++ b/public/sass/_variables.scss
@@ -172,7 +172,7 @@ $table-sm-cell-padding:         .3rem !default;
 // Forms
 $input-padding-x:                .75rem !default;
 $input-padding-y:                .6rem !default;
-$input-line-height:              1.25rem !default;
+$input-line-height:              1.35rem !default;
 
 $input-border-radius:            $border-radius !default;
 $input-border-radius-lg:         $border-radius-lg !default;
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index 0cd1871edd0..b2281c6c578 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -114,7 +114,7 @@ hr {
 
 small,
 .small {
-  font-size: 80%;
+  font-size: 85%;
   font-weight: normal;
 }