From: Mark Otto <markdotto@gmail.com>
Date: Mon, 5 Dec 2016 05:05:19 +0000 (-0800)
Subject: Merge branch 'v4-dev' into carousel
X-Git-Tag: v4.0.0-alpha.6~334^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e3ec8935520e2d118d9d7742abd80183d34beb2;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into carousel
---

1e3ec8935520e2d118d9d7742abd80183d34beb2
diff --cc js/src/carousel.js
index c0d572f0a9,7fda8f6152..a8c16283e2
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@@ -372,15 -355,10 +373,10 @@@ const Carousel = (($) => 
          $(activeElement)
            .one(Util.TRANSITION_END, () => {
              $(nextElement)
-               .removeClass(directionalClassName)
-               .removeClass(orderClassName)
- 
-             $(nextElement).addClass(ClassName.ACTIVE)
 -              .removeClass(`${directionalClassName} ${direction}`)
++              .removeClass(`${directionalClassName} ${orderClassName}`)
+               .addClass(ClassName.ACTIVE)
  
-             $(activeElement)
-               .removeClass(ClassName.ACTIVE)
-               .removeClass(orderClassName)
-               .removeClass(directionalClassName)
 -            $(activeElement).removeClass(`${ClassName.ACTIVE} ${direction} ${directionalClassName}`)
++            $(activeElement).removeClass(`${ClassName.ACTIVE} ${orderClassName} ${directionalClassName}`)
  
              this._isSliding = false
  
diff --cc scss/_carousel.scss
index 0ed8d4e3d7,09f6ea73e0..12e0fa2909
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@@ -7,48 -7,77 +7,48 @@@
    position: relative;
    width: 100%;
    overflow: hidden;
 +}
  
 -  > .carousel-item {
 -    position: relative;
 -    display: none;
 -    @include transition(left .6s ease-in-out);
 -
 -    // Account for jankitude on images
 -    > img,
 -    > a > img {
 -      @extend .img-fluid;
 -      line-height: 1;
 -    }
 +.carousel-item {
 +  position: relative;
 +  display: none;
 +  width: 100%;
  
 -    // CSS3 transforms when supported by the browser
 -    @include if-supports-3d-transforms() {
 -      @include transition(transform .6s ease-in-out);
 -      backface-visibility: hidden;
 -      perspective: 1000px;
 -
 -      &.next,
 -      &.active.right {
 -        left: 0;
 -        transform: translate3d(100%, 0, 0);
 -      }
 -      &.prev,
 -      &.active.left {
 -        left: 0;
 -        transform: translate3d(-100%, 0, 0);
 -      }
 -      &.next.left,
 -      &.prev.right,
 -      &.active {
 -        left: 0;
 -        transform: translate3d(0, 0, 0);
 -      }
 -    }
 +  // CSS3 transforms when supported by the browser
 +  @include if-supports-3d-transforms() {
-     transition: transform .6s ease-in-out;
++    @include transition(transform .6s ease-in-out);
 +    backface-visibility: hidden;
 +    perspective: 1000px;
    }
 +}
  
 -  > .active,
 -  > .next,
 -  > .prev {
 -    display: block;
 -  }
 +.carousel-item.active,
 +.carousel-item-next,
 +.carousel-item-prev {
 +  display: block;
 +}
  
 -  > .active {
 -    left: 0;
 -  }
 +.carousel-item-next,
 +.carousel-item-prev {
 +  position: absolute;
 +  top: 0;
 +}
  
 -  > .next,
 -  > .prev {
 -    position: absolute;
 -    top: 0;
 -    width: 100%;
 +// CSS3 transforms when supported by the browser
 +@include if-supports-3d-transforms() {
 +  .carousel-item-next.carousel-item-left,
 +  .carousel-item-prev.carousel-item-right {
 +    transform: translate3d(0, 0, 0);
    }
  
 -  > .next {
 -    left: 100%;
 -  }
 -  > .prev {
 -    left: -100%;
 -  }
 -  > .next.left,
 -  > .prev.right {
 -    left: 0;
 +  .carousel-item-next,
 +  .active.carousel-item-right {
 +    transform: translate3d(100%, 0, 0);
    }
  
 -  > .active.left {
 -    left: -100%;
 -  }
 -  > .active.right {
 -    left: 100%;
 +  .carousel-item-prev,
 +  .active.carousel-item-left {
 +    transform: translate3d(-100%, 0, 0);
    }
  }