clean up search form in navbar, add new variable for placeholder text color

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a843dc639830ee0ba07cfeccc52ac7c9d1381d75..65e2841e25ceb0edf2fb1598d72d3d7499a28cfc 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3410818d2c20cbbd490f3923e9d899a8d389ac0c..790d916227465c1948307ecba181efc14d680a9f 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2881,10 +2881,8 @@ input[type="submit"].btn.btn-small {
   font-weight: normal;
   line-height: 1;
   color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  background: #666;
-  background: rgba(255, 255, 255, 0.3);
-  border: 1px solid #111;
+  background-color: #626262;
+  border: 1px solid #000000;
   -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
@@ -2894,16 +2892,11 @@ input[type="submit"].btn.btn-small {
   -o-transition: none;
   transition: none;
 }
-.navbar-search .search-query :-moz-placeholder {
-  color: #eeeeee;
-}
-.navbar-search .search-query ::-webkit-input-placeholder {
-  color: #eeeeee;
+.navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
 }
-.navbar-search .search-query:hover {
-  color: #ffffff;
-  background-color: #999999;
-  background-color: rgba(255, 255, 255, 0.5);
+.navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
 }
 .navbar-search .search-query:focus,
 .navbar-search .search-query.focused {

diff --git a/docs/download.html b/docs/download.html
index 858becd719dbaa10ef6147ac2773c3a73254b886..fcb998cfd13db70b43e0b68fe11729dfced96bd5 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -327,6 +327,8 @@
       <input type="text" class="span3" placeholder="transparent">
       <label>@navbarLinkBackgroundActive</label>
       <input type="text" class="span3" placeholder="@navbarBackground">
+      <label>@navbarSearchPlaceholderColor</label>
+      <input type="text" class="span3" placeholder="#ccc">
 
       <h3>Dropdowns</h3>
       <label>@dropdownBackground</label>

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 7b549619da88f9781319b4e55961e8dd47800b32..1e0ecbda44cdfb741436f08fff8d8a40d6ca5309 100644 (file)
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -251,6 +251,8 @@
       <input type="text" class="span3" placeholder="transparent">
       <label>@navbarLinkBackgroundActive</label>
       <input type="text" class="span3" placeholder="@navbarBackground">
+      <label>@navbarSearchPlaceholderColor</label>
+      <input type="text" class="span3" placeholder="#ccc">
 
       <h3>{{_i}}Dropdowns{{/i}}</h3>
       <label>@dropdownBackground</label>

diff --git a/less/navbar.less b/less/navbar.less
index 75ad1336de5614e94ee3721c4c36c862043eec1a..0a4870ec3ca361b608f3bc7e3ca2fa231b98e35e 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -127,23 +127,20 @@
     padding: 4px 9px;
     #font > .sans-serif(13px, normal, 1);
     color: @white;
-    color: rgba(255,255,255,.75);
-    background: #666;
-    background: rgba(255,255,255,.3);
-    border: 1px solid #111;
+    background-color: lighten(@navbarBackground, 25%);
+    border: 1px solid darken(@navbarBackground, 15%);
     @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);
 
-    // Placeholder text gets special styles; can't be bundled together though for some reason
-    .placeholder(@grayLighter);
-
-    // Hover states
-    &:hover {
-      color: @white;
-      background-color: @grayLight;
-      background-color: rgba(255,255,255,.5);
+    // Placeholder text gets special styles; can't be a grouped selector
+    &:-moz-placeholder {
+      color: @navbarSearchPlaceholderColor;
+    }
+    &::-webkit-input-placeholder {
+      color: @navbarSearchPlaceholderColor;
     }
+
     // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,
     &.focused {

diff --git a/less/variables.less b/less/variables.less
index f3ba7122ac9e882c7b0f9796af7396e5c649bca8..6c251da5661b9ee8ffef027ef51f4e90988f0f85 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -149,6 +149,8 @@
 @navbarLinkBackgroundHover:       transparent;
 @navbarLinkBackgroundActive:      @navbarBackground;
 
+@navbarSearchPlaceholderColor:    #ccc;
+
 
 // Hero unit
 // -------------------------