fix responsive navbar

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fbf2c750665bd4fbeeb0b2982cdd058091577fe8..9de6e49c6ff89119ace82fcacf895275d11b8845 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 1ad16d6fd92cc9a8ecb0389d0c19c2deb7be5521..c374fb8e522aaa7af4bfb67629d0c213669457b8 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -667,7 +667,8 @@
   .btn-navbar {
     display: block;
   }
-  .nav-collapse {
+  .nav-collapse,
+  .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c1d995e3074bbc32c581b24bc8d64c3a9fd1e4ca..50fb64dfc5b92069f73dc16dfb71c404e50be66b 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini {
   margin-bottom: 18px;
 }
 .navbar-inner {
-  height: 40px;
+  min-height: 40px;
   padding-left: 20px;
   padding-right: 20px;
   background-color: #2c2c2c;

diff --git a/docs/base-css.html b/docs/base-css.html
index 6ccc216d1b283aa1208f620c503a00affce0672c..1cb10a80618e78ee98ffa1a9daeb6ba883e6dfef 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/components.html b/docs/components.html
index 71134045ad48e9ab50897639f0b536d80cf23f9e..13d1598c09df47209636d5c5ec8a7411a1ddeef1 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/css-tests.html b/docs/css-tests.html
index 0db1057961c4ff62d727111153685541a1f37e01..c2a932b3627bda2ae09b372405925b20cb35de8d 100644 (file)
--- a/docs/css-tests.html
+++ b/docs/css-tests.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/download.html b/docs/download.html
index e4097ea4e5f0b6e125b24092c61d0d3f84d1407e..c0e3b9cf01ed21d739424b1d1619a79089741536 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/examples.html b/docs/examples.html
index dffb46fd965a4dfdcecb7860df18316a22906d9e..7872a39e853b59f0f57b0a8768c3cb4860a92f60 100644 (file)
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/index.html b/docs/index.html
index f7bbfc2b5633bcc33fb4e86842cbbd9eed7c8680..1f526fcdb9074fbea68c1f6122954383ac5c1f79 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="active">
                 <a href="./index.html">Overview</a>

diff --git a/docs/javascript.html b/docs/javascript.html
index 4904eba1621bdec09e25c13c36edf97b6f1d2e48..3cba210a1ce7aeab086b04a49cccf2f3cff4f713 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/less.html b/docs/less.html
index 8b02f19614f65f56379aee1b10f2621ad591fd7c..89e06cf9131e037eca6dff6b61d7e65402ed2ead 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 017fd493eaa87ba67a5a16d91f18f582dc12c3ac..e2715a2c3295cba0d2371b211321859727f8089c 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse 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 d3c06e096f4efce0e2d544228a4ea4b6876524bf..4fdaadb3b622f0328d781dc007f9fdff2b15112e 100644 (file)
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse 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 05930c25efa59dc8a71ce92f0029dad4a517b389..2a27b00e61762211c5b744f12a94b8b7ef3681cd 100644 (file)
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -40,7 +40,7 @@
             <span class="icon-bar"></span>
           </a>
           <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse">
+          <div class="nav-collapse collapse">
             <ul class="nav">
               <li class="">
                 <a href="./index.html">Overview</a>

diff --git a/less/navbar.less b/less/navbar.less
index 7d82e84a028f51e2f26ee7fb4c67dbd8fbf6375f..f2f5153a768087b2ab0d20df0e4e8f7de106ed8f 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,7 +16,7 @@
 
 // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  height: @navbarHeight;
+  min-height: @navbarHeight;
   padding-left:  20px;
   padding-right: 20px;
   #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);

diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 59e456a2287614775c5bfa042d63ece8600148aa..84b0f33f372cc85c6d8118a24df09163fd09fc91 100644 (file)
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -112,7 +112,7 @@
   }
 
   // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse {
+  .nav-collapse, .nav-collapse.collapse {
     overflow: hidden;
     height: 0;
   }
@@ -128,4 +128,4 @@
     height: auto !important;
     overflow: visible !important;
   }
-}
+}
\ No newline at end of file