From 9794c2ebbbad8f0d3bd544ca2c3db3da42a41a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 13 Feb 2014 18:46:39 +0100
Subject: [PATCH] improvements to light theme (Issue #77)

---
 src/css/less/grafana.less                     |  4 --
 src/css/less/variables.dark.less              |  2 +-
 src/css/less/variables.light.less             | 38 +++++++++----------
 .../bootstrap/less/bootswatch.dark.less       |  1 -
 .../bootstrap/less/bootswatch.light.less      |  4 +-
 5 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 3be9ece754c..0a955d56103 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -1,10 +1,6 @@
 @import "submenu.less";
 @import "bootstrap-tagsinput.less";
 
-.navbar-static-top {
-  border-bottom: 1px solid black;
-}
-
 .grafana-dashboard-hide-controls {
   padding: 0;
   .grafana-row {
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 3b88accc80a..6e9c096bbfc 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -185,7 +185,7 @@
 @navbarHeight:                    50px;
 @navbarBackgroundHighlight:       @grayDarker;
 @navbarBackground:                @grayDarker;
-@navbarBorder:                    darken(@navbarBackground, 12%);
+@navbarBorder:                    darken(@navbarBackground, 20%);
 
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;
diff --git a/src/css/less/variables.light.less b/src/css/less/variables.light.less
index f789d2844f0..3f7b091a586 100644
--- a/src/css/less/variables.light.less
+++ b/src/css/less/variables.light.less
@@ -10,21 +10,21 @@
 // Grays
 // -------------------------
 @black:                 #000;
-@grayDarker:            #080808;
-@grayDark:              #999;
-@gray:                  #bbb;
-@grayLight:             #dfdfdf;
-@grayLighter:           #eee;
+@grayDarker:            lighten(#000, 13.5%); // #222
+@grayDark:              lighten(#000, 20%);   // #333
+@gray:                   lighten(#000, 33.5%); // #555
+@grayLight:             lighten(#000, 60%);   // #999
+@grayLighter:           lighten(#000, 93.5%); // #eee
 @white:                 #fff;
 
 
 // Accent colors
 // -------------------------
-@blue:                  #007FFF;
-@blueDark:              #1F26B6;
-@green:                 #3FB618;
-@red:                   #FF0039;
-@yellow:                #FFA500;
+@blue:                  #158CBA;
+@blueDark:              #75CAEB;
+@green:                 #28B62C;
+@red:                   #FF4136;
+@yellow:                #FF851B;
 @orange:                #FF7518;
 @pink:                  #E671B8;
 @purple:                #9954BB;
@@ -184,16 +184,16 @@
 @navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
 
 @navbarHeight:                    50px;
-@navbarBackgroundHighlight:       @grayDarker;
-@navbarBackground:                @grayDarker;
-@navbarBorder:                    transparent;
+@navbarBackgroundHighlight:       #f8f8f8;
+@navbarBackground:                #f8f8f8;
+@navbarBorder:                    darken(@navbarBackground, 6.5%);
 
-@navbarText:                      @white;
-@navbarLinkColor:                 @white;
-@navbarLinkColorHover:            @gray;
-@navbarLinkColorActive:           @white;
-@navbarLinkBackgroundHover:       rgba(0, 0, 0, 0.05);
-@navbarLinkBackgroundActive:      transparent;
+@navbarText:                      #666;
+@navbarLinkColor:                 #666;
+@navbarLinkColorHover:            #333;
+@navbarLinkColorActive:           #555;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      darken(@navbarBackground, 6.5%);
 
 @navbarBrandColor:                @navbarLinkColor;
 
diff --git a/src/vendor/bootstrap/less/bootswatch.dark.less b/src/vendor/bootstrap/less/bootswatch.dark.less
index 8571a65ecd0..eb37314ae7d 100644
--- a/src/vendor/bootstrap/less/bootswatch.dark.less
+++ b/src/vendor/bootstrap/less/bootswatch.dark.less
@@ -53,7 +53,6 @@ hr {
 	.navbar-inner {
 		.border-radius(0);
 		.box-shadow(none);
-		border-bottom: 0px solid @grayDark;
 	}
 
 	.brand {
diff --git a/src/vendor/bootstrap/less/bootswatch.light.less b/src/vendor/bootstrap/less/bootswatch.light.less
index fd8d8cf5b9d..ade89ab185b 100644
--- a/src/vendor/bootstrap/less/bootswatch.light.less
+++ b/src/vendor/bootstrap/less/bootswatch.light.less
@@ -91,7 +91,7 @@ a.text-success:hover { color: darken(@green, 10%); }
 	.nav li.dropdown.open > .dropdown-toggle,
 	.nav li.dropdown.active > .dropdown-toggle,
 	.nav li.dropdown.open.active > .dropdown-toggle {
-		color: @white;
+		color: @navbarLinkColorActive;
 
 		&:hover {
 			color: @grayLighter;
@@ -567,7 +567,7 @@ a.thumbnail {
 
 .modal {
 	.border-radius(0);
-
+	background-color: @white;
 	&-header {
 		border-bottom: none;
 	}