diff options
| author | Martijn Cuppens <[email protected]> | 2018-10-21 09:13:35 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2018-10-21 10:13:35 +0300 |
| commit | c9a43b027ab74f829cc117a05261e18ff4ca3b7c (patch) | |
| tree | ce9f969ff2cbe4a5af417003f2192bb17f78c29b | |
| parent | 59f1802e985399b95b7f3ff1136ac3eaa83b8897 (diff) | |
| download | bootstrap-c9a43b027ab74f829cc117a05261e18ff4ca3b7c.tar.xz bootstrap-c9a43b027ab74f829cc117a05261e18ff4ca3b7c.zip | |
Re-add carousel control transition (#27277)
| -rw-r--r-- | scss/_carousel.scss | 5 | ||||
| -rw-r--r-- | scss/_variables.scss | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index a3259f4f5..9693b129e 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -116,15 +116,14 @@ color: $carousel-control-color; text-align: center; opacity: $carousel-control-opacity; - // We can't have a transition here because WebKit cancels the carousel - // animation if you trip this while in the middle of another animation. + @include transition($carousel-control-transition); // Hover/focus state @include hover-focus { color: $carousel-control-color; text-decoration: none; outline: 0; - opacity: .9; + opacity: $carousel-control-hover-opacity; } } .carousel-control-prev { diff --git a/scss/_variables.scss b/scss/_variables.scss index b9187fc3d..0d6d64858 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -965,6 +965,8 @@ $breadcrumb-border-radius: $border-radius !default; $carousel-control-color: $white !default; $carousel-control-width: 15% !default; $carousel-control-opacity: .5 !default; +$carousel-control-hover-opacity: .9 !default; +$carousel-control-transition: opacity .15s ease !default; $carousel-indicator-width: 30px !default; $carousel-indicator-height: 3px !default; |