[MERGE] : with trunk

bzr revid: aja@tinyerp.com-20140331041956-0ots0gkn1d4ffudq

1 files changed, 29 insertions, 0 deletions

diff --git a/addons/website/data/bootstrap/component-animations.less b/addons/website/data/bootstrap/component-animations.less
new file mode 100644
index 00000000000..1efe45e2c39
--- /dev/null
+++ b/addons/website/data/bootstrap/component-animations.less
@@ -0,0 +1,29 @@
+//
+// Component animations
+// --------------------------------------------------
+
+// Heads up!
+//
+// We don't use the `.opacity()` mixin here since it causes a bug with text
+// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
+
+.fade {
+  opacity: 0;
+  .transition(opacity .15s linear);
+  &.in {
+    opacity: 1;
+  }
+}
+
+.collapse {
+  display: none;
+  &.in {
+    display: block;
+  }
+}
+.collapsing {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  .transition(height .35s ease);
+}