mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-23 13:43:11 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto
2017-07-01 22:24:20 -07:00
parent 1c64adfb41 3603088454
commit 44712d1600
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scss/_carousel.scss
View File

@@ -22,7 +22,7 @@
.carousel-item.active, .carousel-item.active,
.carousel-item-next, .carousel-item-next,
.carousel-item-prev { .carousel-item-prev {
display: flex; display: block;
} }
.carousel-item-next, .carousel-item-next,
@@ -34,17 +34,29 @@
// CSS3 transforms when supported by the browser // CSS3 transforms when supported by the browser
.carousel-item-next.carousel-item-left, .carousel-item-next.carousel-item-left,
.carousel-item-prev.carousel-item-right { .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, .carousel-item-next,
.active.carousel-item-right { .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, .carousel-item-prev,
.active.carousel-item-left { .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 { li {
position: relative; position: relative;
flex: 1 0 auto; flex: 0 1 auto;
max-width: $carousel-indicator-width; width: $carousel-indicator-width;
height: $carousel-indicator-height; height: $carousel-indicator-height;
margin-right: $carousel-indicator-spacer; margin-right: $carousel-indicator-spacer;
margin-left: $carousel-indicator-spacer; margin-left: $carousel-indicator-spacer;

6
scss/utilities/_text.scss
View File

@@ -34,14 +34,14 @@
// Contextual colors // Contextual colors
.text-white { .text-white { color: #fff !important; }
color: #fff !important;
}
@each $color, $value in $theme-colors { @each $color, $value in $theme-colors {
@include text-emphasis-variant('.text-#{$color}', $value); @include text-emphasis-variant('.text-#{$color}', $value);
} }
.text-muted { color: $gray-400 !important; }
// Misc // Misc
.text-hide { .text-hide {