diff options
| author | Mark Otto <[email protected]> | 2013-02-02 18:58:08 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-02 18:58:08 -0800 |
| commit | d6048031edd5f931080cf792c283d0d669838825 (patch) | |
| tree | f4b86d1a825d5b2b2c7f9cf8d60f02ff41f4531c | |
| parent | b1f1d7871fb4eaf0418a8ff4e626aa3dda0d4049 (diff) | |
| parent | dbe8aed76ed556a082a8dd99dbcc786e4d7ea8df (diff) | |
| download | bootstrap-d6048031edd5f931080cf792c283d0d669838825.tar.xz bootstrap-d6048031edd5f931080cf792c283d0d669838825.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 3 | ||||
| -rw-r--r-- | less/carousel.less | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ca9c699b6..19e7e271a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5919,7 +5919,8 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel-inner > .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { display: block; line-height: 1; } diff --git a/less/carousel.less b/less/carousel.less index b321e5bb5..83045e541 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -21,12 +21,13 @@ display: none; position: relative; .transition(.6s ease-in-out left); - } - // Account for jankitude on images - > .item > img { - display: block; - line-height: 1; + // Account for jankitude on images + > img, + > a > img { + display: block; + line-height: 1; + } } > .active, |