fixes #4342: navbar vars not in use, render navbar dividers

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fe6c3ef1ff1aca273c2fcb28222881c7bd616297..6abfad08119b1332dbb8c2090349d11f9626759c 100644 (file)
--- 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 bb9cdb8f5f0b35cd6853cb91dff2f57e1bc38ba7..39fe7bc4fbcf2b1d64d5cbbb52a29d7b8146fa83 100644 (file)
--- 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 91995cf7d5597147f7a4d01578565f7828843682..2f2f5a78a5cd66ed22c9585aa465ec19d2f998fb 100644 (file)
--- 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>
 

diff --git a/less/navbar.less b/less/navbar.less
index 0e027d2c32a1d4c9ac76e9500cd6cb97ca36823a..4306047c70b53238e1fc9f76fba89e4363eb8625 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -76,6 +76,15 @@
   }
 }
 
+// Dividers in navbar
+// -------------------------
+.navbar .divider-vertical {
+  height: @navbarHeight;
+  margin: 0 9px;
+  border-left: 1px solid @navbarBackground;
+  border-right: 1px solid @navbarBackgroundHighlight;
+}
+
 // Buttons in navbar
 // -------------------------
 .navbar .btn,
@@ -128,7 +137,6 @@
     padding: 4px 14px;
     #font > .sans-serif(13px, normal, 1);
     .border-radius(15px); // redeclare because of specificity of the type attribute
-    .placeholder(@navbarSearchPlaceholderColor);
   }
 }
 
@@ -373,6 +381,12 @@
     }
   }
 
+  // Dividers in navbar
+  .divider-vertical {
+    border-left-color: @navbarInverseBackground;
+    border-right-color: @navbarInverseBackgroundHighlight;
+  }
+
   // Dropdowns
   .nav li.dropdown.open > .dropdown-toggle,
   .nav li.dropdown.active > .dropdown-toggle,

diff --git a/less/variables.less b/less/variables.less
index d4b44a2de247a274682cb7e02880df61ce8924c5..42b76df45ebda8acc67a5f40d968d8e201198169 100644 (file)
--- a/less/variables.less
+++ b/less/variables.less
@@ -168,10 +168,6 @@
 @navbarLinkBackgroundHover:       transparent;
 @navbarLinkBackgroundActive:      darken(@navbarBackground, 5%);
 
-@navbarSearchBackground:          lighten(@navbarBackground, 25%);
-@navbarSearchBackgroundFocus:     @white;
-@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
-@navbarSearchPlaceholderColor:    #ccc;
 @navbarBrandColor:                @navbarLinkColor;
 
 // Inverted navbar