Merge master

2013-06-10 12:51:39 -05:00
parent 5e0b0a263e 4cd6cea04d
commit 273c2e3f72
76 changed files with 513 additions and 277 deletions
--- a/assets/less/bootstrap/component-animations.less
+++ b/assets/less/bootstrap/component-animations.less
@@ -0,0 +1,22 @@
+//
+// Component animations
+// --------------------------------------------------
+
+
+.fade {
+  opacity: 0;
+  .transition(opacity .15s linear);
+  &.in {
+    opacity: 1;
+  }
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  .transition(height .35s ease);
+  &.in {
+    height: auto;
+  }
+}