spacelab navbar search border

3 files changed, 26 insertions, 6 deletions

diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css
index e0501a61..416c4c33 100644
--- a/spacelab/bootstrap.css
+++ b/spacelab/bootstrap.css
@@ -3405,9 +3405,21 @@ a.thumbnail:hover {
 .subnav .nav > li.active > a:hover {
   color: #333333;
 }
-.navbar-search .search-query {
+.navbar-search .search-query, .navbar-search .search-query:hover {
   border: none;
-  color: #999;
+  color: #999999;
+}
+.navbar-search .search-query :-moz-placeholder, .navbar-search .search-query:hover :-moz-placeholder {
+  color: #999999;
+}
+.navbar-search .search-query::-webkit-input-placeholder, .navbar-search .search-query:hover::-webkit-input-placeholder {
+  color: #999999;
+}
+.navbar-search .search-query:focus,
+.navbar-search .search-query:hover:focus,
+.navbar-search .search-query.focused,
+.navbar-search .search-query:hover.focused {
+  color: #333333;
 }
 .btn {
   background-color: #f1f1f1;
diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css
index 43df1b7e..dc4805c3 100644
--- a/spacelab/bootstrap.min.css
+++ b/spacelab/bootstrap.min.css
@@ -613,7 +613,9 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .navbar .nav .dropdown-toggle:hover .caret{border-top-color:#4183c4;}
 .subnav .nav>li>a{font-weight:bold;color:#777;}.subnav .nav>li>a:hover{color:#4183c4;}
 .subnav .nav>li.active>a{color:#333333;}.subnav .nav>li.active>a:hover{color:#333333;}
-.navbar-search .search-query{border:none;color:#999;}
+.navbar-search .search-query,.navbar-search .search-query:hover{border:none;color:#999999;}.navbar-search .search-query :-moz-placeholder,.navbar-search .search-query:hover :-moz-placeholder{color:#999999;}
+.navbar-search .search-query::-webkit-input-placeholder,.navbar-search .search-query:hover::-webkit-input-placeholder{color:#999999;}
+.navbar-search .search-query:focus,.navbar-search .search-query:hover:focus,.navbar-search .search-query.focused,.navbar-search .search-query:hover.focused{color:#333333;}
 .btn{background-color:#f1f1f1;background-image:-moz-linear-gradient(top, #f4f4f4, #ececec);background-image:-ms-linear-gradient(top, #f4f4f4, #ececec);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec));background-image:-webkit-linear-gradient(top, #f4f4f4, #ececec);background-image:-o-linear-gradient(top, #f4f4f4, #ececec);background-image:linear-gradient(top, #f4f4f4, #ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#ececec', GradientType=0);border-color:#ececec #ececec #c6c6c6;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#ececec;}
 .btn:active,.btn.active{background-color:#d3d3d3 \9;}
 .btn-primary{background-color:#707070;background-image:-moz-linear-gradient(top, #909090, #3f3f3f);background-image:-ms-linear-gradient(top, #909090, #3f3f3f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#909090), to(#3f3f3f));background-image:-webkit-linear-gradient(top, #909090, #3f3f3f);background-image:-o-linear-gradient(top, #909090, #3f3f3f);background-image:linear-gradient(top, #909090, #3f3f3f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#909090', endColorstr='#3f3f3f', GradientType=0);border-color:#3f3f3f #3f3f3f #191919;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#3f3f3f;}
diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less
index 4be62242..ddcd0545 100755
--- a/spacelab/bootswatch.less
+++ b/spacelab/bootswatch.less
@@ -42,7 +42,6 @@
 	}
 }
 
-
 .navbar .nav .open.dropdown .dropdown-toggle {
 	color: @linkColor;
 }
@@ -78,9 +77,16 @@
 	}
 }
 
-.navbar-search .search-query {
+.navbar-search .search-query,
+.navbar-search .search-query:hover {
 	border: none;
-	color: #999;
+	color: @grayLight;
+	.placeholder(@grayLight);
+	
+    &:focus,
+    &.focused {
+		color: @textColor;
+	}
 }
 
 // BUTTON