From e38d08d4c0c23e678549b10f96286b37a7d8c7ed Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 09:06:37 -0600 Subject: [PATCH 1/4] fixes jankiness with anchor tags in carousel. --- docs/assets/css/bootstrap.css | 4 +++- less/carousel.less | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0c5ac91e3..6c568a9180 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5917,7 +5917,9 @@ a.badge:hover { transition: 0.6s ease-in-out left; } -.carousel-inner > .item > img { +.carousel-inner > .item > img, +.carousel-inner > .item > a, +.carousel-inner > .item > img > a { display: block; line-height: 1; } diff --git a/less/carousel.less b/less/carousel.less index b321e5bb5a..f87bf489cf 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -21,12 +21,14 @@ 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 > a { + display: block; + line-height: 1; + } } > .active, From ed2cf5b3e3e195d5ccf77b9e36c9508a877ccdd6 Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 11:04:12 -0600 Subject: [PATCH 2/4] its not dyslexic being easy. --- less/carousel.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/carousel.less b/less/carousel.less index f87bf489cf..6280e6a146 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -25,7 +25,7 @@ // Account for jankitude on images > img, > a, - > img > a { + > a > img { display: block; line-height: 1; } From 6014e630547d08dcc9610546e4f04aaac0c30be5 Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 11:10:41 -0600 Subject: [PATCH 3/4] lets see how much i can mess this pull request up. :| --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6c568a9180..bb05c79d51 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5919,7 +5919,7 @@ a.badge:hover { .carousel-inner > .item > img, .carousel-inner > .item > a, -.carousel-inner > .item > img > a { +.carousel-inner > .item > a > img { display: block; line-height: 1; } From 2f44d8d2dac855ecaeb0ad4ac460c83bb2ca321b Mon Sep 17 00:00:00 2001 From: RJ Regenold Date: Thu, 31 Jan 2013 12:49:53 -0600 Subject: [PATCH 4/4] removes anchor tag definition. --- docs/assets/css/bootstrap.css | 1 - less/carousel.less | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bb05c79d51..e09e1e23a0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5918,7 +5918,6 @@ a.badge:hover { } .carousel-inner > .item > img, -.carousel-inner > .item > a, .carousel-inner > .item > a > img { display: block; line-height: 1; diff --git a/less/carousel.less b/less/carousel.less index 6280e6a146..83045e541a 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -24,7 +24,6 @@ // Account for jankitude on images > img, - > a, > a > img { display: block; line-height: 1;