Skip to content
GitLab
Commit 261ed70a authored by Mark Otto's avatar Mark Otto Committed by GitHub
Browse files

Merge pull request #21019 from Starsam80/fix-collapse 

Rename .in to .active to fix collapse
parents bcbbc8ee aa08274d
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
+6 -6
scss/_animation.scss
+ 4
- 4
View file @ 261ed70a
...@@ -2,26 +2,26 @@ ...@@ -2,26 +2,26 @@
opacity: 0; opacity: 0;
transition: opacity .15s linear; transition: opacity .15s linear;
&.in { &.active {
opacity: 1; opacity: 1;
} }
} }
.collapse { .collapse {
display: none; display: none;
&.in { &.active {
display: block; display: block;
} }
} }
tr { tr {
&.collapse.in { &.collapse.active {
display: table-row; display: table-row;
} }
} }
tbody { tbody {
&.collapse.in { &.collapse.active {
display: table-row-group; display: table-row-group;
} }
} }
......
scss/_modal.scss
+ 2
- 2
View file @ 261ed70a
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
transition: transform .3s ease-out; transition: transform .3s ease-out;
transform: translate(0, -25%); transform: translate(0, -25%);
} }
&.in .modal-dialog { transform: translate(0, 0); } &.active .modal-dialog { transform: translate(0, 0); }
} }
.modal-open .modal { .modal-open .modal {
overflow-x: hidden; overflow-x: hidden;
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
// Fade for backdrop // Fade for backdrop
&.fade { opacity: 0; } &.fade { opacity: 0; }
&.in { opacity: $modal-backdrop-opacity; } &.active { opacity: $modal-backdrop-opacity; }
} }
// Modal header // Modal header
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment