From: Mark Otto <markdotto@gmail.com>
Date: Tue, 20 Dec 2016 05:44:03 +0000 (-0800)
Subject: Merge branch 'fix-20982' of https://github.com/Starsam80/bootstrap into Starsam80... 
X-Git-Tag: v4.0.0-alpha.6~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eeb71c91c39c01142d2501e6feda7e4f09f8205;p=thirdparty%2Fbootstrap.git

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

8eeb71c91c39c01142d2501e6feda7e4f09f8205
diff --cc docs/components/collapse.md
index 3e465319e4,5b34301182..e3172fa759
--- a/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 61e51567cf,b6aea7ac03..87be3df44e
--- a/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 21754df114,31ecf7479c..86c04a5f8b
--- a/scss/_transitions.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;
    }
  }