2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch 'master' into thumbnail-extend

Conflicts:
	dist/css/bootstrap.css
This commit is contained in:
Mark Otto
2014-02-06 18:52:03 -08:00
6 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
// Account for jankitude on images
> img,
> a > img {
.img-responsive();
&:extend(.img-responsive);
line-height: 1;
}
}