From: Mark Otto <otto@github.com>
Date: Fri, 24 May 2013 04:06:02 +0000 (-0700)
Subject: Remove commented out code and properly nest CSS again for .collapse
X-Git-Tag: v3.0.0-rc1~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371d14e2173888932b1edf11083ccbf73bae313e;p=thirdparty%2Fbootstrap.git

Remove commented out code and properly nest CSS again for .collapse
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 29cf519236..b65d864807 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1985,16 +1985,6 @@ input[type="button"].btn-block {
   opacity: 1;
 }
 
-/*.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  .transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
-}*/
-
 .collapse {
   position: relative;
   height: 0;
diff --git a/less/component-animations.less b/less/component-animations.less
index b25adc932a..50e5e45c12 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -11,22 +11,13 @@
   }
 }
 
-/*.collapse {
+.collapse {
   position: relative;
   height: 0;
   overflow: hidden;
   .transition(height .35s ease);
+
   &.in {
     height: auto;
   }
-}*/
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  .transition(height .35s ease);
-}
-.collapse.in {
-  height: auto;
 }