Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80...

diff --cc docs/components/collapse.md
index 3e465319e4b631daad6b2d0f99655170fcf652f0,5b3430118209ea011005eb250f6a798ede93a955..e3172fa7595f9f7621bcde75f289e4a509cfde18
--- 1/docs/components/collapse.md
--- 2/docs/components/collapse.md
+++ b/docs/components/collapse.md
@@@ -101,10 -101,10 +101,10 @@@ Additionally, if your control element i
  The collapse plugin utilizes a few classes to handle the heavy lifting:
  
  - `.collapse` hides the content
- - `.collapse.active` shows the content
+ - `.collapse.show` shows the content
  - `.collapsing` is added when the transition starts, and removed when it finishes
  
 -These classes can be found in `_animation.scss`.
 +These classes can be found in `_transitions.scss`.
  
  ### Via data attributes
  

diff --cc scss/_modal.scss
index 61e51567cfcb52eb9408e97df281a0c775765f9d,b6aea7ac03addd14e997b4928ecfbc5dd0825152..87be3df44e82b22099ecf7fb55596c1b83f4df0a
--- 1/scss/_modal.scss
--- 2/scss/_modal.scss
+++ b/scss/_modal.scss
@@@ -28,10 -28,10 +28,10 @@@
  
    // When fading in the modal, animate it to slide down
    &.fade .modal-dialog {
 -    @include transition(transform .3s ease-out);
 +    @include transition($modal-transition);
      transform: translate(0, -25%);
    }
-   &.active .modal-dialog { transform: translate(0, 0); }
+   &.show .modal-dialog { transform: translate(0, 0); }
  }
  .modal-open .modal {
    overflow-x: hidden;

diff --cc scss/_transitions.scss
index 21754df1142cf4867e83205d74427edf0dd7f3f9,31ecf7479cd67c780b2e670720802f01ca3fbd36..86c04a5f8b20c4fc580bee9e60c227ae61846394
--- 1/scss/_transitions.scss
--- 2/scss/_animation.scss
+++ b/scss/_transitions.scss
@@@ -1,8 -1,9 +1,8 @@@
  .fade {
    opacity: 0;
 -
 -  @include transition(opacity .15s linear);
 +  @include transition($transition-fade);
  
-   &.active {
+   &.show {
      opacity: 1;
    }
  }