spruce: more contrast on navbar-inverse search-query color

4 files changed, 19 insertions, 10 deletions

diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
index 59b744ad..c39930f1 100644
--- a/spruce/bootstrap.css
+++ b/spruce/bootstrap.css
@@ -4045,13 +4045,13 @@ input[type="submit"].btn.btn-mini {
   transition: none;
 }
 .navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #ffffff;
+  color: #555555;
 }
 .navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #ffffff;
+  color: #555555;
 }
 .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #ffffff;
+  color: #555555;
 }
 .navbar-inverse .navbar-search .search-query:focus,
 .navbar-inverse .navbar-search .search-query.focused {
@@ -5214,6 +5214,9 @@ blockquote small {
 .navbar .nav > li > .dropdown-menu::after {
   border-bottom: none;
 }
+.navbar-inverse .navbar-search .search-query {
+  color: #555555;
+}
 .navbar-inverse .dropdown-menu {
   background-color: #cbcbcb;
 }
@@ -5227,7 +5230,7 @@ blockquote small {
   border-bottom: 1px solid rgba(0, 0, 0, 0.2);
 }
 .navbar-inverse .dropdown-menu .nav-header {
-  color: #333333;
+  color: #555555;
 }
 @media (max-width: 979px) {
   .navbar .nav-collapse .nav li > a {
diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
index 4e7a9db8..9da4dc47 100644
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.css
@@ -703,9 +703,10 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
 .navbar-inverse .nav li.dropdown>a:hover .caret{border-top-color:#333333;border-bottom-color:#333333;}
 .navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;}
 .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;}
-.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#ffffff;border-color:#dddddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ffffff;}
 .navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ffffff;}
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ffffff;}
+.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#ffffff;border-color:#dddddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#555555;}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#555555;}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#555555;}
 .navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d8d8d8;background-image:-moz-linear-gradient(top, #dddddd, #d0d0d0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#dddddd), to(#d0d0d0));background-image:-webkit-linear-gradient(top, #dddddd, #d0d0d0);background-image:-o-linear-gradient(top, #dddddd, #d0d0d0);background-image:linear-gradient(to bottom, #dddddd, #d0d0d0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdddddd', endColorstr='#ffd0d0d0', GradientType=0);border-color:#d0d0d0 #d0d0d0 #aaaaaa;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d0d0d0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#d0d0d0;*background-color:#c3c3c3;}
 .navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#b7b7b7 \9;}
@@ -869,10 +870,11 @@ blockquote small{color:#013435;}
 .navbar .navbar-search .search-query{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);line-height:normal;color:#ffffff;}
 .navbar .dropdown-menu li>a{font-family:'Crete Round',serif;font-weight:normal;}
 .navbar .nav>li>.dropdown-menu::before,.navbar .nav>li>.dropdown-menu::after{border-bottom:none;}
+.navbar-inverse .navbar-search .search-query{color:#555555;}
 .navbar-inverse .dropdown-menu{background-color:#cbcbcb;}.navbar-inverse .dropdown-menu li>a{color:#333333;}.navbar-inverse .dropdown-menu li>a:hover{background-color:#dddddd;}
 .navbar-inverse .dropdown-menu .divider{border-bottom:1px solid rgba(0, 0, 0, 0.2);}
-.navbar-inverse .dropdown-menu .nav-header{color:#333333;}
-@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse .nav li>a:hover{background-color:#002425;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav>li>a{padding:12px 12px 10px;border-color:transparent;background-color:transparent;font-family:'Crete Round',serif;font-weight:normal;color:#ffffff;}
+.navbar-inverse .dropdown-menu .nav-header{color:#555555;}
+@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse .nav li>a:hover{background-color:#002425;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;}div.subnav .nav>li>a{padding:12px 12px 10px;border-color:transparent;background-color:transparent;font-family:'Crete Round',serif;font-weight:normal;color:#ffffff;}
 div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{background-color:#002425;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;color:#ffffff;}
 div.subnav.subnav-fixed{top:55px;}
 .nav .nav-header{color:#333333;}
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
index 5bb18ef3..4d834a7b 100755
--- a/spruce/bootswatch.less
+++ b/spruce/bootswatch.less
@@ -129,6 +129,10 @@ blockquote {
 
 	&-inverse {
 
+		.navbar-search .search-query {
+			color: @gray;
+		}
+
 		.dropdown-menu {
 			background-color: @navbarInverseLinkBackgroundHover;
 
diff --git a/spruce/variables.less b/spruce/variables.less
index e2ec00fd..228557f7 100755
--- a/spruce/variables.less
+++ b/spruce/variables.less
@@ -80,7 +80,7 @@
 @tableBackground:                   lighten(#ddd, 10%); // overall background-color
 @tableBackgroundAccent:             lighten(#ddd, 5%); // for striping
 @tableBackgroundHover:              #ddd; // for hover
-@tableBorder:                       @headingsColor; // table and cell border
+@tableBorder:                       @grayLight; // table and cell border
 
 // Buttons
 // -------------------------
@@ -209,7 +209,7 @@
 @navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
 @navbarInverseSearchBackgroundFocus:     @white;
 @navbarInverseSearchBorder:              @navbarInverseBackground;
-@navbarInverseSearchPlaceholderColor:    @white;
+@navbarInverseSearchPlaceholderColor:    @gray;
 
 @navbarInverseBrandColor:                @navbarInverseLinkColor;