Commit de77d048 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
parents 089d4348 67d39404
Showing with 89 additions and 3 deletions
+89 -3
...@@ -4871,6 +4871,37 @@ button.close { ...@@ -4871,6 +4871,37 @@ button.close {
.carousel-inner > .item > a > img { .carousel-inner > .item > a > img {
line-height: 1; line-height: 1;
} }
@media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item {
-webkit-transition: -webkit-transform(.6s ease-in-out);
-o-transition: -o-transform(.6s ease-in-out);
transition: transform(.6s ease-in-out);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-perspective: 1000;
perspective: 1000;
}
.carousel-inner > .item.next,
.carousel-inner > .item.active.right {
left: 0;
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
}
.carousel-inner > .item.prev,
.carousel-inner > .item.active.left {
left: 0;
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
.carousel-inner > .item.next.left,
.carousel-inner > .item.prev.right,
.carousel-inner > .item.active {
left: 0;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}
.carousel-inner > .active, .carousel-inner > .active,
.carousel-inner > .next, .carousel-inner > .next,
.carousel-inner > .prev { .carousel-inner > .prev {
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
This diff is collapsed.
...@@ -4871,6 +4871,37 @@ button.close { ...@@ -4871,6 +4871,37 @@ button.close {
.carousel-inner > .item > a > img { .carousel-inner > .item > a > img {
line-height: 1; line-height: 1;
} }
@media all and (transform-3d), (-webkit-transform-3d) {
.carousel-inner > .item {
-webkit-transition: -webkit-transform(.6s ease-in-out);
-o-transition: -o-transform(.6s ease-in-out);
transition: transform(.6s ease-in-out);
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-perspective: 1000;
perspective: 1000;
}
.carousel-inner > .item.next,
.carousel-inner > .item.active.right {
left: 0;
-webkit-transform: translate3d(100%, 0, 0);
transform: translate3d(100%, 0, 0);
}
.carousel-inner > .item.prev,
.carousel-inner > .item.active.left {
left: 0;
-webkit-transform: translate3d(-100%, 0, 0);
transform: translate3d(-100%, 0, 0);
}
.carousel-inner > .item.next.left,
.carousel-inner > .item.prev.right,
.carousel-inner > .item.active {
left: 0;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
}
.carousel-inner > .active, .carousel-inner > .active,
.carousel-inner > .next, .carousel-inner > .next,
.carousel-inner > .prev { .carousel-inner > .prev {
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
...@@ -24,6 +24,30 @@ ...@@ -24,6 +24,30 @@
&:extend(.img-responsive); &:extend(.img-responsive);
line-height: 1; line-height: 1;
} }
// WebKit CSS3 transforms for supported devices
@media all and (transform-3d), (-webkit-transform-3d) {
transition: transform(0.6s ease-in-out);
backface-visibility: hidden;
perspective: 1000;
&.next,
&.active.right {
transform: translate3d(100%, 0, 0);
left: 0;
}
&.prev,
&.active.left {
transform: translate3d(-100%, 0, 0);
left: 0;
}
&.next.left,
&.prev.right,
&.active {
transform: translate3d(0, 0, 0);
left: 0;
}
}
} }
> .active, > .active,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment