2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

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

Conflicts:
	less/grid.less
This commit is contained in:
Mark Otto
2013-03-14 13:25:59 -07:00
12 changed files with 60 additions and 60 deletions
+4 -4
View File
@@ -10,14 +10,14 @@
// Mobile-first defaults
.row {
margin-left: @grid-gutter-width / -2;
margin-right: @grid-gutter-width / -2;
margin-left: (@grid-gutter-width / -2);
margin-right: (@grid-gutter-width / -2);
.clear_float();
}
[class^="span"] {
min-height: 1px;
padding-left: @grid-gutter-width / 2;
padding-right: @grid-gutter-width / 2;
padding-left: (@grid-gutter-width / 2);
padding-right: (@grid-gutter-width / 2);
}
// Responsive: Tablets and up