From a3e9fc547cca06da9b0a3449aa447436665b6fb9 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 10 Mar 2012 16:15:54 -0800
Subject: clean up search form in navbar, add new variable for placeholder text
 color

---
 docs/assets/bootstrap.zip              | Bin 54842 -> 54803 bytes
 docs/assets/css/bootstrap.css          |  19 ++++++-------------
 docs/download.html                     |   2 ++
 docs/templates/pages/download.mustache |   2 ++
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a843dc639..65e2841e2 100644
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 3410818d2..790d91622 100644
--- 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 858becd71..fcb998cfd 100644
--- 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 7b549619d..1e0ecbda4 100644
--- 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>
-- 
cgit v1.2.3