From 2d4534e112d7ceca112f7a11f768ed733813cbb1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Jun 2017 17:35:02 -0700 Subject: [PATCH 1/4] use @supports to apply transform3d to those who can do it, then provide a non-3d fallback to ie11 --- scss/_carousel.scss | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 41eca949fb..d0f210df1a 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -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); + } } From 75156f419a503dda978b875d582e184c222bddd4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Jun 2017 17:41:04 -0700 Subject: [PATCH 2/4] using max-width in flex: 1 0 auto; in ie11 offsets the center-aligned contents --- scss/_carousel.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_carousel.scss b/scss/_carousel.scss index d0f210df1a..6d16039b5b 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -134,7 +134,7 @@ li { position: relative; flex: 1 0 auto; - max-width: $carousel-indicator-width; + width: $carousel-indicator-width; height: $carousel-indicator-height; margin-right: $carousel-indicator-spacer; margin-left: $carousel-indicator-spacer; From 2bf4de0698461f3916c869e84c9f781458974fb3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 1 Jul 2017 16:48:46 -0700 Subject: [PATCH 3/4] Update carousel display settings Use `display: block` since we're not really using any flex styles on the `.carousel-items` (only their controls and indicators). For the indicators, since moving to `width`, our indicators grow to fill available space, so we need to change `flex: 1 0 auto` to `flex: 0 1 auto` to prevent that. --- scss/_carousel.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 6d16039b5b..8aa14ace79 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, @@ -133,7 +133,7 @@ li { position: relative; - flex: 1 0 auto; + flex: 0 1 auto; width: $carousel-indicator-width; height: $carousel-indicator-height; margin-right: $carousel-indicator-spacer; From 360308845429f07e9eedb669254df3e70fd60fc4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 1 Jul 2017 18:37:27 -0700 Subject: [PATCH 4/4] Restore .text-muted --- scss/utilities/_text.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 90e06f5c43..7f20ed76ee 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 {