Merge pull request #21019 from Starsam80/fix-collapse

Rename .in to .active to fix collapse

Merge pull request #21019 from Starsam80/fix-collapse
Rename .in to .active to fix collapse
261ed70a · Mark Otto · GitHub · bcbbc8ee · aa08274d · 261ed70a
Commit 261ed70a authored 8 years ago by Mark Otto Committed by GitHub 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 6 deletions
+6 -6
--- 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;
  }
 }

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