aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-28 15:40:51 -0800
committerMark Otto <[email protected]>2012-11-28 15:40:51 -0800
commit78390d12afe2bc6f2b15f21f8ba87f8ba69738c6 (patch)
treef02af372b10d12cfc944583047b2df06c4b76a7e
parentcb69aa976f4834d1b6c22ed3dea8a13328d63748 (diff)
downloadbootstrap-78390d12afe2bc6f2b15f21f8ba87f8ba69738c6.tar.xz
bootstrap-78390d12afe2bc6f2b15f21f8ba87f8ba69738c6.zip
Fix the carousel after we scoped selectors
-rw-r--r--docs/assets/css/bootstrap.css28
-rw-r--r--less/carousel.less2
2 files changed, 15 insertions, 15 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 71b486188..225f8739d 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5913,7 +5913,7 @@ a.badge:hover {
overflow: hidden;
}
-.carousel > .item {
+.carousel-inner > .item {
position: relative;
display: none;
-webkit-transition: 0.6s ease-in-out left;
@@ -5922,46 +5922,46 @@ a.badge:hover {
transition: 0.6s ease-in-out left;
}
-.carousel > .item > img {
+.carousel-inner > .item > img {
display: block;
line-height: 1;
}
-.carousel > .active,
-.carousel > .next,
-.carousel > .prev {
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
display: block;
}
-.carousel > .active {
+.carousel-inner > .active {
left: 0;
}
-.carousel > .next,
-.carousel > .prev {
+.carousel-inner > .next,
+.carousel-inner > .prev {
position: absolute;
top: 0;
width: 100%;
}
-.carousel > .next {
+.carousel-inner > .next {
left: 100%;
}
-.carousel > .prev {
+.carousel-inner > .prev {
left: -100%;
}
-.carousel > .next.left,
-.carousel > .prev.right {
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
left: 0;
}
-.carousel > .active.left {
+.carousel-inner > .active.left {
left: -100%;
}
-.carousel > .active.right {
+.carousel-inner > .active.right {
left: 100%;
}
diff --git a/less/carousel.less b/less/carousel.less
index 072884d4f..2dc050603 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -15,7 +15,7 @@
position: relative;
}
-.carousel {
+.carousel-inner {
> .item {
display: none;