Commit d6048031 authored by Mark Otto's avatar Mark Otto

Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

parents b1f1d787 dbe8aed7
......@@ -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;
}
......
......@@ -21,13 +21,14 @@
display: none;
position: relative;
.transition(.6s ease-in-out left);
}
// Account for jankitude on images
> .item > img {
> img,
> a > img {
display: block;
line-height: 1;
}
}
> .active,
> .next,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment