diff options
| author | Mark Otto <[email protected]> | 2013-02-02 12:35:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-02 12:35:39 -0800 |
| commit | dbe8aed76ed556a082a8dd99dbcc786e4d7ea8df (patch) | |
| tree | 9589a8f2b3af7cb8be43583c36ae617a0c267ab6 | |
| parent | 0bfbf1446d853e5edb066acb68bcf3eb995b47b3 (diff) | |
| parent | 2f44d8d2dac855ecaeb0ad4ac460c83bb2ca321b (diff) | |
| download | bootstrap-dbe8aed76ed556a082a8dd99dbcc786e4d7ea8df.tar.xz bootstrap-dbe8aed76ed556a082a8dd99dbcc786e4d7ea8df.zip | |
Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
| -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, |