aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-11-25 22:06:40 -0800
committerMark Otto <[email protected]>2016-11-25 22:06:40 -0800
commit6e16a6b40a26661ab0b5e33d05c130d2bc527f7a (patch)
tree722ca45d8b10c23ab09928b4ff8a0c6cae3e7701
parent990a901e52965c616bbcd4a1c075e2c7841c11fe (diff)
downloadbootstrap-6e16a6b40a26661ab0b5e33d05c130d2bc527f7a.tar.xz
bootstrap-6e16a6b40a26661ab0b5e33d05c130d2bc527f7a.zip
Wrap .fade and .collapsing transition properties in -transitions
-rw-r--r--scss/_animation.scss14
1 files changed, 10 insertions, 4 deletions
diff --git a/scss/_animation.scss b/scss/_animation.scss
index 1be1971fb..4112468d0 100644
--- a/scss/_animation.scss
+++ b/scss/_animation.scss
@@ -1,6 +1,9 @@
.fade {
opacity: 0;
- transition: opacity .15s linear;
+
+ @if $enable-transitions {
+ transition: opacity .15s linear;
+ }
&.active {
opacity: 1;
@@ -30,7 +33,10 @@ tbody {
position: relative;
height: 0;
overflow: hidden;
- transition-timing-function: ease;
- transition-duration: .35s;
- transition-property: height;
+
+ @if $enable-transitions {
+ transition-timing-function: ease;
+ transition-duration: .35s;
+ transition-property: height;
+ }
}