2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into pr/11648

Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
This commit is contained in:
Mark Otto
2013-11-30 13:09:55 -08:00
27 changed files with 447 additions and 425 deletions
+2 -2
View File
@@ -28,8 +28,8 @@
// Extra small grid
//
// Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target.
// Columns, offsets, pushes, and pulls for extra small devices like
// smartphones.
.make-grid-columns-float(xs);
.make-grid(@grid-columns, xs, width);