Rename .in to .active to fix collapse

diff --git a/scss/_animation.scss b/scss/_animation.scss
index f0dfff81fe40ff79dd5f503583f8e32c7c7f01bc..1be1971fbf10552042fc1a97400ac97adfb1b7a0 100644 (file)
--- 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 c326d5699eb18f4767896eb6e1e04571badfc8e0..39554581d39c18903eab0fd6d40fcd984fd62143 100644 (file)
--- 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