2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00

Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
This commit is contained in:
Mark Otto
2013-02-04 11:12:09 -08:00
8 changed files with 360 additions and 11 deletions
+2 -1
View File
@@ -4392,7 +4392,8 @@ a.counter: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;
}