update navbar search form

5 files changed, 20 insertions, 29 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 728590ba2..0da6a96ec 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Tue Oct 11 09:43:00 PDT 2011
+ * Date: Tue Oct 11 09:52:07 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1164,11 +1164,11 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 }
 .navbar-search {
   position: relative;
-  margin-top: 5px;
+  margin-top: 6px;
   margin-bottom: 0;
   float: left;
 }
-.navbar-search input {
+.navbar-search .search-query {
   background-color: #444;
   background-color: rgba(255, 255, 255, 0.3);
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -1179,30 +1179,27 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #ffffff;
   color: rgba(255, 255, 255, 0.75);
   border: 1px solid #111;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  -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);
   -webkit-transition: none;
   -moz-transition: none;
   -ms-transition: none;
   -o-transition: none;
   transition: none;
 }
-.navbar-search input:-moz-placeholder {
+.navbar-search .search-query:-moz-placeholder {
   color: #e6e6e6;
 }
-.navbar-search input::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
   color: #e6e6e6;
 }
-.navbar-search input:hover {
+.navbar-search .search-query:hover {
   background-color: #bfbfbf;
   background-color: rgba(255, 255, 255, 0.5);
   color: #ffffff;
 }
-.navbar-search input:focus, .navbar-search input.focused {
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
   outline: 0;
   background-color: #ffffff;
   color: #404040;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 0e949c603..45277ae40 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -205,10 +205,10 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0
 .navbar .brand a:hover,.navbar ul .active>a{background-color:#333333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
 .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
 .navbar p{margin:0;line-height:40px;}.navbar p a:hover{background-color:transparent;color:#ffffff;}
-.navbar-search{position:relative;margin-top:5px;margin-bottom:0;float:left;}.navbar-search input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search input:-moz-placeholder{color:#e6e6e6;}
-.navbar-search input::-webkit-input-placeholder{color:#e6e6e6;}
-.navbar-search input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;}
-.navbar-search input:focus,.navbar-search input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-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);}
+.navbar-search{position:relative;margin-top:6px;margin-bottom:0;float:left;}.navbar-search .search-query{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-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);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#e6e6e6;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#e6e6e6;}
+.navbar-search .search-query:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-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);}
 .navbar-static{margin-bottom:18px;}
 .navbar-static .navbar-inner{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .navbar-fixed{position:fixed;top:0;left:0;right:0;z-index:10000;}
diff --git a/docs/index.html b/docs/index.html
index 7e9d6c1d0..ced0c658f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -44,7 +44,6 @@
           <ul class="nav">
             <li class="active"><a href="#overview">Overview</a></li>
             <li><a href="#about">About</a></li>
-
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-dropdown="true">Scaffolding</a>
               <ul class="dropdown-menu">
@@ -52,7 +51,6 @@
                 <li><a href="#layouts">Layouts</a></li>
               </ul>
             </li>
-
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-dropdown="true">CSS</a>
               <ul class="dropdown-menu">
@@ -61,7 +59,6 @@
                 <li><a href="#forms">Forms</a></li>
               </ul>
             </li>
-
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-dropdown="true">Patterns</a>
               <ul class="dropdown-menu">
@@ -71,8 +68,6 @@
                 <li><a href="#popovers">Popovers</a></li>
               </ul>
             </li>
-
-
             <li><a href="#javascript">Javascript</a></li>
             <li><a href="#less">Less</a></li>
           </ul>
@@ -1278,7 +1273,7 @@
           </li>
         </ul>
         <form class="form-search navbar-search pull-left" action="">
-          <input type="text" placeholder="Search">
+          <input type="text" class="search-query" placeholder="Search">
         </form>
         <ul class="nav secondary-nav">
           <li class="dropdown">
diff --git a/docs/javascript.html b/docs/javascript.html
index dd4c2d03a..66caad10b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -243,8 +243,8 @@ $('#my-modal').bind('hidden', function () {
                   <li><a href="#">Link</a></li>
                   <li><a href="#">Link</a></li>
                 </ul>
-                <form action="" class="search-form navbar-search">
-                  <input type="text" placeholder="Search">
+                <form class="form-search navbar-search pull-left" action="">
+                  <input type="text" class="search-query" placeholder="Search">
                 </form>
                 <ul class="nav secondary-nav">
                   <li class="dropdown">
diff --git a/lib/patterns.less b/lib/patterns.less
index a82e2856d..f2a0b7f0e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -63,10 +63,10 @@
 // Navbar search
 .navbar-search {
   position: relative;
-  margin-top: 5px;
+  margin-top: 6px;
   margin-bottom: 0;
   float: left;
-  input {
+  .search-query {
     background-color: #444;
     background-color: rgba(255,255,255,.3);
     #font > .sans-serif(13px, normal, 1);
@@ -74,8 +74,7 @@
     color: @white;
     color: rgba(255,255,255,.75);
     border: 1px solid #111;
-    .border-radius(4px);
-    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
+    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);