Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

1 files changed, 9 insertions, 4 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 79ea5445a..de08356f6 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2016,6 +2016,14 @@ input[type="button"].btn-block {
 }
 
 .collapse {
+  display: none;
+}
+
+.collapse.in {
+  display: block;
+}
+
+.collapsing {
   position: relative;
   height: 0;
   overflow: hidden;
@@ -2023,10 +2031,6 @@ input[type="button"].btn-block {
           transition: height 0.35s ease;
 }
 
-.collapse.in {
-  height: auto;
-}
-
 .caret {
   display: inline-block;
   width: 0;
@@ -2939,6 +2943,7 @@ button.close {
     display: none;
   }
   .nav-collapse.collapse {
+    display: block !important;
     height: auto !important;
     overflow: visible !important;
   }