diff options
| author | Mark Otto <[email protected]> | 2016-11-26 01:27:55 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-11-26 01:27:54 -0800 |
| commit | 8cd29af7ee12d3a684374636bc75078c8b401c4c (patch) | |
| tree | f3339a0ba73b7278a002fd421e2855c2a4f2a3b4 | |
| parent | 03ad9562709dc074bdefb7740788cc263425bf28 (diff) | |
| parent | 3154c0585ade1e450d3ae46301d80ac5a8cdb396 (diff) | |
| download | bootstrap-8cd29af7ee12d3a684374636bc75078c8b401c4c.tar.xz bootstrap-8cd29af7ee12d3a684374636bc75078c8b401c4c.zip | |
Merge pull request #21203 from twbs/conditional-transition-animations
Wrap .fade and .collapsing transition properties in $enable-transitions
| -rw-r--r-- | scss/_animation.scss | 14 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 11 insertions, 5 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; + } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 529ea4989..d4cb87d19 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -114,7 +114,7 @@ $enable-flex: false !default; $enable-rounded: true !default; $enable-shadows: false !default; $enable-gradients: false !default; -$enable-transitions: false !default; +$enable-transitions: true !default; $enable-hover-media-query: false !default; $enable-grid-classes: true !default; $enable-print-styles: true !default; |