aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-25 11:47:36 -0800
committerMark Otto <[email protected]>2012-01-25 11:47:36 -0800
commit06017b26ca5a9c835edb9d42188431fa30c7e499 (patch)
tree664807bac06d0d4f3a83ed6ee0c2465b5c963af8
parent58d08a2db3e2ed1b789a5290ced2f0327c9c163b (diff)
downloadbootstrap-06017b26ca5a9c835edb9d42188431fa30c7e499.tar.xz
bootstrap-06017b26ca5a9c835edb9d42188431fa30c7e499.zip
fix bottom visual bug on carousel images
-rw-r--r--bootstrap.css6
-rw-r--r--bootstrap.min.css1
-rw-r--r--lib/carousel.less6
3 files changed, 12 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 4bffde24d..7a538c717 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 11:31:57 PST 2012
+ * Date: Wed Jan 25 11:47:25 PST 2012
*/
article,
aside,
@@ -2924,6 +2924,10 @@ a.thumbnail:hover {
-o-transition: 0.6s ease-in-out left;
transition: 0.6s ease-in-out left;
}
+.carousel .item > img {
+ display: block;
+ line-height: 1;
+}
.carousel .active, .carousel .next, .carousel .prev {
display: block;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index c800de5e0..87ea670e0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -524,6 +524,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
.carousel{position:relative;line-height:1;}
.carousel-inner{overflow:hidden;width:100%;position:relative;}
.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
.carousel .active,.carousel .next,.carousel .prev{display:block;}
.carousel .active{left:0;}
.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
diff --git a/lib/carousel.less b/lib/carousel.less
index b0e95bfe9..254a9f60c 100644
--- a/lib/carousel.less
+++ b/lib/carousel.less
@@ -20,6 +20,12 @@
.transition(.6s ease-in-out left);
}
+ // Account for jankitude on images
+ .item > img {
+ display: block;
+ line-height: 1;
+ }
+
.active,
.next,
.prev { display: block; }