diff options
| author | Mark Otto <markdotto@gmail.com> | 2016-12-20 08:44:03 +0300 |
|---|---|---|
| committer | Mark Otto <markdotto@gmail.com> | 2016-12-20 08:44:03 +0300 |
| commit | 8eeb71c91c39c01142d2501e6feda7e4f09f8205 (patch) | |
| tree | e7b751ac49ede3082cd200d38846c95751825a1c /scss | |
| parent | 7e5f21c2b4e5d28b75f58de1509699eaa49c4872 (diff) | |
| parent | d991c868a4b9b598a622f739547f71ee0ea7a352 (diff) | |
Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80-fix-20982
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_dropdown.scss | 2 | ||||
| -rw-r--r-- | scss/_modal.scss | 4 | ||||
| -rw-r--r-- | scss/_tooltip.scss | 2 | ||||
| -rw-r--r-- | scss/_transitions.scss | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index b287e20376..1f37acef29 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -111,7 +111,7 @@ } // Open state for the dropdown -.active { +.show { // Show the menu > .dropdown-menu { display: block; diff --git a/scss/_modal.scss b/scss/_modal.scss index 61e51567cf..87be3df44e 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -31,7 +31,7 @@ @include transition($modal-transition); transform: translate(0, -25%); } - &.active .modal-dialog { transform: translate(0, 0); } + &.show .modal-dialog { transform: translate(0, 0); } } .modal-open .modal { overflow-x: hidden; @@ -69,7 +69,7 @@ // Fade for backdrop &.fade { opacity: 0; } - &.active { opacity: $modal-backdrop-opacity; } + &.show { opacity: $modal-backdrop-opacity; } } // Modal header diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index abfa9bdb51..24e198d464 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -11,7 +11,7 @@ word-wrap: break-word; opacity: 0; - &.active { opacity: $tooltip-opacity; } + &.show { opacity: $tooltip-opacity; } &.tooltip-top, &.bs-tether-element-attached-bottom { diff --git a/scss/_transitions.scss b/scss/_transitions.scss index 21754df114..86c04a5f8b 100644 --- a/scss/_transitions.scss +++ b/scss/_transitions.scss @@ -2,26 +2,26 @@ opacity: 0; @include transition($transition-fade); - &.active { + &.show { opacity: 1; } } .collapse { display: none; - &.active { + &.show { display: block; } } tr { - &.collapse.active { + &.collapse.show { display: table-row; } } tbody { - &.collapse.active { + &.collapse.show { display: table-row-group; } } |