2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +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
+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,