From 6e16a6b40a26661ab0b5e33d05c130d2bc527f7a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 25 Nov 2016 22:06:40 -0800 Subject: [PATCH] Wrap .fade and .collapsing transition properties in -transitions --- scss/_animation.scss | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scss/_animation.scss b/scss/_animation.scss index 1be1971fbf..4112468d04 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; + } }