diff options
| author | Mark Otto <[email protected]> | 2017-07-01 22:24:20 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-07-01 22:24:20 -0700 |
| commit | 44712d1600a176ae9772a36ebaaf77e00ecb4973 (patch) | |
| tree | 14c84b1d318626c0702788b835f6475dd08a2cdb | |
| parent | 1c64adfb417925bb2bf2d73580c35762826181c2 (diff) | |
| parent | 360308845429f07e9eedb669254df3e70fd60fc4 (diff) | |
| download | bootstrap-44712d1600a176ae9772a36ebaaf77e00ecb4973.tar.xz bootstrap-44712d1600a176ae9772a36ebaaf77e00ecb4973.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
| -rw-r--r-- | scss/_carousel.scss | 24 | ||||
| -rw-r--r-- | scss/utilities/_text.scss | 6 |
2 files changed, 21 insertions, 9 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 41eca949f..8aa14ace7 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -22,7 +22,7 @@ .carousel-item.active, .carousel-item-next, .carousel-item-prev { - display: flex; + display: block; } .carousel-item-next, @@ -34,17 +34,29 @@ // CSS3 transforms when supported by the browser .carousel-item-next.carousel-item-left, .carousel-item-prev.carousel-item-right { - transform: translate3d(0, 0, 0); + transform: translateX(0); + + @supports (transform-style: preserve-3d) { + transform: translate3d(0, 0, 0); + } } .carousel-item-next, .active.carousel-item-right { - transform: translate3d(100%, 0, 0); + transform: translateX(100%); + + @supports (transform-style: preserve-3d) { + transform: translate3d(100%, 0, 0); + } } .carousel-item-prev, .active.carousel-item-left { - transform: translate3d(-100%, 0, 0); + transform: translateX(-100%); + + @supports (transform-style: preserve-3d) { + transform: translate3d(-100%, 0, 0); + } } @@ -121,8 +133,8 @@ li { position: relative; - flex: 1 0 auto; - max-width: $carousel-indicator-width; + flex: 0 1 auto; + width: $carousel-indicator-width; height: $carousel-indicator-height; margin-right: $carousel-indicator-spacer; margin-left: $carousel-indicator-spacer; diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 90e06f5c4..7f20ed76e 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -34,14 +34,14 @@ // Contextual colors -.text-white { - color: #fff !important; -} +.text-white { color: #fff !important; } @each $color, $value in $theme-colors { @include text-emphasis-variant('.text-#{$color}', $value); } +.text-muted { color: $gray-400 !important; } + // Misc .text-hide { |