fix broken navbar collapse

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 1b658bf833ae4f2417d0d94485667b5f173312bc..bd974a462514d6effcf531941a008e6d2bd5a3f0 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 68ccf676fddf61aa6b2fa49c31238c0af8cea4c3..76e27d67201fe99d25b156f2b898a166a68aa8ca 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -305,12 +305,14 @@
   .btn-navbar {
     display: block;
   }
-  .nav-collapse.collapse {
+  .nav-collapse {
     overflow: hidden;
     height: 0;
   }
-  .nav-collapse.collapse.in {
-    height: auto;
+}
+@media (min-width: 940px) {
+  .nav-collapse.collapse {
+    height: auto !important;
   }
 }
 @media (min-width: 1200px) {

diff --git a/docs/base-css.html b/docs/base-css.html
index 291feb6e16cff087a431cf91dacae19a900b6e64..0406ff229eb3a1e19620870059e09b2219d2f5f1 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/components.html b/docs/components.html
index 81c328352a07605c9ca6f42ee6081ec4e11d5414..9fc762fc621b54c2b0ffc76830987f8c8176486a 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/download.html b/docs/download.html
index 97f1c24c49e474d5c8043fae7abfd0bc5ad3a32f..832b07ce65dd8fec4c4116c3e00b024bcbed676a 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/examples.html b/docs/examples.html
index b2fd296d14010fd90a283045ae15166d8c5740d6..7d79fc0a0a344912ef8aaaa49334edc589baf445 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/index.html b/docs/index.html
index 7d728dc7ddbcc1e0e531d1845216da4f51326fbf..e20d08bcdd6c598ba97398f3405d1fb74fc12fe7 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="active">
                 <a href="./index.html">Overview</a>

diff --git a/docs/javascript.html b/docs/javascript.html
index 9838aa0d1915180dc371cff3248145bc7e4b90cd..eb4a175c33553bbf4791b9d8af75b4cdcd22ba77 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/less.html b/docs/less.html
index 4499c78dfcc4a35f0880894e923a7e2d65d078f9..5935c9125979f175e2f428f4333f942c31feb1c0 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>
@@ -345,13 +345,13 @@
         <tbody>
           <tr>
             <td class="span3"><code>@warningText</code></td>
-            <td>#c09853</td>
-            <td class="swatch-col"><span class="swatch" style="background-color: #c09853;"></span></td>
+            <td>#f3edd2</td>
+            <td class="swatch-col"><span class="swatch" style="background-color: #f3edd2;"></span></td>
           </tr>
           <tr>
             <td><code>@warningBackground</code></td>
-            <td>#f3edd2</td>
-            <td><span class="swatch" style="background-color: #f3edd2;"></span></td>
+            <td>#c09853</td>
+            <td><span class="swatch" style="background-color: #c09853;"></span></td>
           </tr>
           <tr>
             <td><code>@errorText</code></td>

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 00aadd472e183cfe78aadcce56b073c687c18eee..b9eb399f9b1badb90acb83a520284da603f46a0c 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index b49ec28f6e6168f4e1868589e3310e42b9407d2a..7c0ab655be12ab9647a49a8b2de3aa0acb8f0ca2 100644 (file)
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="{{index}}">
                 <a href="./index.html">{{_i}}Overview{{/i}}</a>

diff --git a/docs/upgrading.html b/docs/upgrading.html
index b8e82fe31ba9b76bed88497c689359e83bfecb5e..d7ad30f561de2344e171b895e83dde1044727679 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -39,7 +39,7 @@
             <span class="i-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
+          <div class="nav-collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/less/responsive.less b/less/responsive.less
index 7ae28b8258c795f70801d6000d6f046185609922..a1d4cf2c88219e22173832e819e6970212d612bc 100644 (file)
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -22,6 +22,7 @@
 }
 
 
+
 // UP TO LANDSCAPE PHONE
 // ---------------------
 
@@ -103,11 +104,11 @@
 }
 
 
+
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
 @media (max-width: 768px) {
-
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -133,6 +134,7 @@
 }
 
 
+
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
@@ -225,6 +227,7 @@
 }
 
 
+
 // TABLETS AND BELOW
 // -----------------
 @media (max-width: 940px) {
@@ -335,17 +338,25 @@
   }
 
   // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse.collapse {
+  .nav-collapse {
     overflow: hidden;
     height: 0;
   }
-  .nav-collapse.collapse.in {
-    height: auto;
-  }
+}
+
+
+
+// DEFAULT DESKTOP
+// ---------------
 
+@media (min-width: 940px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+  }
 }
 
 
+
 // LARGE DESKTOP & UP
 // ------------------