Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
4fa2d9e0
Commit
4fa2d9e0
authored
10 years ago
by
Hayden Bleasel
Browse files
Options
Download
Email Patches
Plain Diff
Improved mixin ability with nested media query
parent
bab63abe
5 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!13074
WebKit CSS3 carousel transforms for supported devices
,
!25326
Adjust examples
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dist/css/bootstrap.css
+41
-41
dist/css/bootstrap.css
less/carousel.less
+19
-23
less/carousel.less
with
60 additions
and
64 deletions
+60
-64
dist/css/bootstrap.css
+
41
-
41
View file @
4fa2d9e0
...
@@ -5610,6 +5610,47 @@ button.close {
...
@@ -5610,6 +5610,47 @@ button.close {
.carousel-inner
>
.item
>
a
>
img
{
.carousel-inner
>
.item
>
a
>
img
{
line-height
:
1
;
line-height
:
1
;
}
}
@media
all
and
(
-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
;
-ms-backface-visibility
:
hidden
;
-o-backface-visibility
:
hidden
;
backface-visibility
:
hidden
;
-webkit-perspective
:
1000
;
-ms-perspective
:
1000
;
-o-perspective
:
1000
;
perspective
:
1000
;
}
.carousel-inner
>
.item.next
,
.carousel-inner
>
.item.active.right
{
left
:
0
;
-webkit-transform
:
translate3d
(
100%
,
0
,
0
);
-ms-transform
:
translate3d
(
100%
,
0
,
0
);
-o-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
);
-ms-transform
:
translate3d
(
-100%
,
0
,
0
);
-o-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
);
-ms-transform
:
translate3d
(
0
,
0
,
0
);
-o-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
{
...
@@ -5776,47 +5817,6 @@ button.close {
...
@@ -5776,47 +5817,6 @@ button.close {
bottom
:
20px
;
bottom
:
20px
;
}
}
}
}
@media
all
and
(
-webkit-transform-3d
)
{
.carousel
.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
;
-ms-backface-visibility
:
hidden
;
-o-backface-visibility
:
hidden
;
backface-visibility
:
hidden
;
-webkit-perspective
:
1000
;
-ms-perspective
:
1000
;
-o-perspective
:
1000
;
perspective
:
1000
;
}
.carousel
.item.next
,
.carousel
.item.active.right
{
left
:
0
;
-webkit-transform
:
translate3d
(
100%
,
0
,
0
);
-ms-transform
:
translate3d
(
100%
,
0
,
0
);
-o-transform
:
translate3d
(
100%
,
0
,
0
);
transform
:
translate3d
(
100%
,
0
,
0
);
}
.carousel
.item.prev
,
.carousel
.item.active.left
{
left
:
0
;
-webkit-transform
:
translate3d
(
-100%
,
0
,
0
);
-ms-transform
:
translate3d
(
-100%
,
0
,
0
);
-o-transform
:
translate3d
(
-100%
,
0
,
0
);
transform
:
translate3d
(
-100%
,
0
,
0
);
}
.carousel
.item.next.left
,
.carousel
.item.prev.right
,
.carousel
.item.active
{
left
:
0
;
-webkit-transform
:
translate3d
(
0
,
0
,
0
);
-ms-transform
:
translate3d
(
0
,
0
,
0
);
-o-transform
:
translate3d
(
0
,
0
,
0
);
transform
:
translate3d
(
0
,
0
,
0
);
}
}
.clearfix
:before
,
.clearfix
:before
,
.clearfix
:after
,
.clearfix
:after
,
.dl-horizontal
dd
:before
,
.dl-horizontal
dd
:before
,
...
...
This diff is collapsed.
Click to expand it.
less/carousel.less
+
19
-
23
View file @
4fa2d9e0
...
@@ -24,6 +24,25 @@
...
@@ -24,6 +24,25 @@
&:extend(.img-responsive);
&:extend(.img-responsive);
line-height: 1;
line-height: 1;
}
}
// WebKit CSS3 transforms for supported devices
@media all and (-webkit-transform-3d) {
.transition-transform(~'0.6s ease-in-out');
.backface-visibility(~'hidden');
.perspective(1000);
&.next, &.active.right {
.translate3d(100%, 0, 0);
left: 0;
}
&.prev, &.active.left {
.translate3d(-100%, 0, 0);
left: 0;
}
&.next.left, &.prev.right, &.active {
.translate3d(0, 0, 0);
left: 0;
}
}
}
}
> .active,
> .active,
...
@@ -230,26 +249,3 @@
...
@@ -230,26 +249,3 @@
bottom: 20px;
bottom: 20px;
}
}
}
}
// WebKit CSS3 transforms for supported devices
@media all and (-webkit-transform-3d) {
.carousel {
.item {
.transition-transform(~'0.6s ease-in-out');
.backface-visibility(~'hidden');
.perspective(1000);
&.next, &.active.right {
.translate3d(100%, 0, 0);
left: 0;
}
&.prev, &.active.left {
.translate3d(-100%, 0, 0);
left: 0;
}
&.next.left, &.prev.right, &.active {
.translate3d(0, 0, 0);
left: 0;
}
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment