From 97a23ef2e66919094ecfc517d9b5b9278a64441d Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 13 Aug 2012 22:57:40 -0700
Subject: fixes #4342: navbar vars not in use, render navbar dividers

---
 docs/assets/css/bootstrap.css            | 24 ++++++++++++------------
 docs/components.html                     |  2 ++
 docs/templates/pages/components.mustache |  2 ++
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fe6c3ef1f..6abfad081 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4054,6 +4054,13 @@ input[type="submit"].btn.btn-mini {
   color: #333333;
 }
 
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
 .navbar .btn,
 .navbar .btn-group {
   margin-top: 6px;
@@ -4129,18 +4136,6 @@ input[type="submit"].btn.btn-mini {
           border-radius: 15px;
 }
 
-.navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
-}
-
-.navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
-}
-
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   position: fixed;
@@ -4412,6 +4407,11 @@ input[type="submit"].btn.btn-mini {
   color: #ffffff;
 }
 
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
 .navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
 .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
 .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
diff --git a/docs/components.html b/docs/components.html
index bb9cdb8f5..39fe7bc4f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1106,6 +1106,7 @@
               <div class="navbar-inner">
                 <form class="navbar-form pull-left">
                   <input type="text" class="span2">
+                  <button type="submit" class="btn">Submit</button>
                 </form>
               </div>
             </div>
@@ -1113,6 +1114,7 @@
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
   &lt;input type="text" class="span2"&gt;
+  &lt;button type="submit" class="btn"&gt;Submit&lt;/button&gt;
 &lt;/form&gt;
 </pre>
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 91995cf7d..2f2f5a78a 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1035,6 +1035,7 @@
               <div class="navbar-inner">
                 <form class="navbar-form pull-left">
                   <input type="text" class="span2">
+                  <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
                 </form>
               </div>
             </div>
@@ -1042,6 +1043,7 @@
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
   &lt;input type="text" class="span2"&gt;
+  &lt;button type="submit" class="btn"&gt;{{_i}}Submit{{/i}}&lt;/button&gt;
 &lt;/form&gt;
 </pre>
 
-- 
cgit v1.2.3