0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Merge pull request #21019 from Starsam80/fix-collapse

Rename .in to .active to fix collapse
This commit is contained in:
Mark Otto 2016-10-26 21:14:16 -07:00 committed by GitHub
commit 261ed70a18
2 changed files with 6 additions and 6 deletions

View File

@ -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;
}
}

View File

@ -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