rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #21203 from twbs/conditional-transition-animations

Browse Source 
Wrap .fade and .collapsing transition properties in $enable-transitions
This commit is contained in:
Mark Otto 2016-11-26 01:27:55 -08:00 committed by GitHub
commit 8cd29af7ee
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scss/_animation.scss
View File

@ -1,6 +1,9 @@
.fade { .fade {
opacity: 0; opacity: 0;
transition: opacity .15s linear;
@if $enable-transitions {
transition: opacity .15s linear;
}
&.active { &.active {
opacity: 1; opacity: 1;
@ -30,7 +33,10 @@ tbody {
position: relative; position: relative;
height: 0; height: 0;
overflow: hidden; overflow: hidden;
transition-timing-function: ease;
transition-duration: .35s; @if $enable-transitions {
transition-property: height; transition-timing-function: ease;
transition-duration: .35s;
transition-property: height;
}
} }

2
scss/_variables.scss
View File

@ -114,7 +114,7 @@ $enable-flex: false !default;
$enable-rounded: true !default; $enable-rounded: true !default;
$enable-shadows: false !default; $enable-shadows: false !default;
$enable-gradients: false !default; $enable-gradients: false !default;
$enable-transitions: false !default; $enable-transitions: true !default;
$enable-hover-media-query: false !default; $enable-hover-media-query: false !default;
$enable-grid-classes: true !default; $enable-grid-classes: true !default;
$enable-print-styles: true !default; $enable-print-styles: true !default;