updates to responsive and docs for responsive navbar

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 43ef8547f51c723bbb95604a3789563d13a59b0e..e09e58a822cc75ff46fc3cbeab96e510dd57fce0 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small {
 .btn-navbar .i-bar + .i-bar {
   margin-top: 3px;
 }
+.nav-collapse.collapse {
+  height: auto !important;
+}
 .navbar .brand:hover {
   text-decoration: none;
 }

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index f36fa76d619f1230d68cfbe93c91215ab45d21ca..7876f300a3eff4d43ca8a5a0e02e8f7a69a9af71 100644 (file)
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -671,11 +671,6 @@ form.well {
   }
 }
 
-@media (min-width: 940px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-  }
-}
 
 @media (max-width: 768px) {
 
@@ -768,6 +763,7 @@ form.well {
 
 }
 
+
 @media (max-width: 940px) {
 
   /* Unfloat brand */
@@ -780,6 +776,7 @@ form.well {
 
 }
 
+
 /* LARGE DESKTOP SCREENS */
 @media (min-width: 1210px) {
 

diff --git a/docs/components.html b/docs/components.html
index 710e7de77c21af0150c804012412ee95fa980a34..f9f8db0579a4fbb526cb2685d4abc31d550d8a11 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -766,6 +766,9 @@
   </div>
 </div>
 </pre>
+      <div class="alert alert-info">
+        <strong>Heads up!</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a>.
+      </div>
 
     </div><!-- /.span -->
     <div class="span4">

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 5c91431fa16bd718d38a0cc57f607dfe482c263a..5cb914e32d8e177a9953b044de82d704e690dd21 100644 (file)
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -694,6 +694,9 @@
   </div>
 </div>
 </pre>
+      <div class="alert alert-info">
+        <strong>{{_i}}Heads up!{{/i}}</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a>.
+      </div>
 
     </div><!-- /.span -->
     <div class="span4">

diff --git a/less/navbar.less b/less/navbar.less
index 4fd8a9073da81f776580d58d50086d88cf8bbd9c..404782e61adbc38a24b1250b74a43e5dd021365d 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -38,6 +38,10 @@
 .btn-navbar .i-bar + .i-bar {
   margin-top: 3px;
 }
+.nav-collapse.collapse {
+  height: auto !important; // Required to be !important to override native collapse plugin
+}
+
 
 // Brand, links, text, and buttons
 .navbar {