diff options
| author | Mark Otto <[email protected]> | 2016-10-26 21:14:16 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-26 21:14:16 -0700 |
| commit | 261ed70a1876e2d2c2bac6272c91fcfd931da685 (patch) | |
| tree | 282ddcd2ee7a2f25e9cac662839c7bb28ac2bbd9 | |
| parent | bcbbc8eeda78ff4d32e844d63c26d112f9a9cf19 (diff) | |
| parent | aa08274d249dfc22d8bc705f18cf6d323d6f9c4a (diff) | |
| download | bootstrap-261ed70a1876e2d2c2bac6272c91fcfd931da685.tar.xz bootstrap-261ed70a1876e2d2c2bac6272c91fcfd931da685.zip | |
Merge pull request #21019 from Starsam80/fix-collapse
Rename .in to .active to fix collapse
| -rw-r--r-- | scss/_animation.scss | 8 | ||||
| -rw-r--r-- | scss/_modal.scss | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scss/_animation.scss b/scss/_animation.scss index f0dfff81f..1be1971fb 100644 --- a/scss/_animation.scss +++ b/scss/_animation.scss @@ -2,26 +2,26 @@ opacity: 0; transition: opacity .15s linear; - &.in { + &.active { opacity: 1; } } .collapse { display: none; - &.in { + &.active { display: block; } } tr { - &.collapse.in { + &.collapse.active { display: table-row; } } tbody { - &.collapse.in { + &.collapse.active { display: table-row-group; } } diff --git a/scss/_modal.scss b/scss/_modal.scss index c326d5699..39554581d 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -31,7 +31,7 @@ transition: transform .3s ease-out; transform: translate(0, -25%); } - &.in .modal-dialog { transform: translate(0, 0); } + &.active .modal-dialog { transform: translate(0, 0); } } .modal-open .modal { overflow-x: hidden; @@ -69,7 +69,7 @@ // Fade for backdrop &.fade { opacity: 0; } - &.in { opacity: $modal-backdrop-opacity; } + &.active { opacity: $modal-backdrop-opacity; } } // Modal header |