mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-02-02 18:58:08 -08:00
parent b1f1d7871f dbe8aed76e
commit d6048031ed
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+2 -1
View File
@@ -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;
}
less/carousel.less
+6 -5
View File
@@ -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,