aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-30 23:44:23 -0700
committerMark Otto <[email protected]>2012-09-30 23:44:23 -0700
commit4b0d71abc1e888932a60982bacd3619b89aba7ce (patch)
treec6cd2f2751b3c2b64960824bad1f4f8e36d39734
parentb6f6235e9bc31a4e5910077c1c7a0f43a0562216 (diff)
downloadbootstrap-4b0d71abc1e888932a60982bacd3619b89aba7ce.tar.xz
bootstrap-4b0d71abc1e888932a60982bacd3619b89aba7ce.zip
carousel refinements
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--less/carousel.less43
2 files changed, 30 insertions, 21 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 6f5df4832..b2f60df3e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5370,7 +5370,7 @@ a.badge:hover {
top: 0;
bottom: 0;
left: 0;
- width: 100px;
+ width: 120px;
opacity: 0.5;
filter: alpha(opacity=50);
}
@@ -5414,13 +5414,17 @@ a.badge:hover {
z-index: 5;
display: block;
margin-top: -35px;
- margin-left: 35px;
+ margin-left: 30px;
font-size: 80px;
font-weight: 100;
color: #fff;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
}
+.carousel-control.right .control {
+ margin-left: 70px;
+}
+
.carousel-caption {
position: absolute;
right: 0;
diff --git a/less/carousel.less b/less/carousel.less
index d92cb1bcc..ba0de8c9b 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -72,14 +72,9 @@
top: 0;
left: 0;
bottom: 0;
- width: 100px;
+ width: 120px;
.opacity(50);
- &.left {
- #gradient > .horizontal(rgba(0,0,0,.75), rgba(0,0,0,.001));
- background-color: transparent;
- }
-
// we can't have this transition here
// because webkit cancels the carousel
// animation if you trip this while
@@ -87,7 +82,11 @@
// ;_;
// .transition(opacity .2s linear);
- // Reposition the right one
+ // Set gradients for backgrounds
+ &.left {
+ #gradient > .horizontal(rgba(0,0,0,.75), rgba(0,0,0,.001));
+ background-color: transparent;
+ }
&.right {
left: auto;
right: 0;
@@ -101,19 +100,25 @@
text-decoration: none;
.opacity(90);
}
+
+ // Toggles
+ .control {
+ position: absolute;
+ top: 50%;
+ z-index: 5;
+ display: block;
+ margin-top: -35px;
+ margin-left: 30px;
+ font-size: 80px;
+ font-weight: 100;
+ color: #fff;
+ text-shadow: 0 1px 2px rgba(0,0,0,.6);
+ }
+ &.right .control {
+ margin-left: 70px;
+ }
}
-.carousel-control .control {
- position: absolute;
- top: 50%;
- z-index: 5;
- display: block;
- margin-top: -35px;
- margin-left: 35px;
- font-size: 80px;
- font-weight: 100;
- color: #fff;
- text-shadow: 0 1px 2px rgba(0,0,0,.6);
-}
+
// Caption for text below images