]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
update grid xs mixin and update docs to match new mixins
authorMark Otto <otto@github.com>
Mon, 12 Aug 2013 18:52:51 +0000 (11:52 -0700)
committerMark Otto <otto@github.com>
Mon, 12 Aug 2013 18:52:51 +0000 (11:52 -0700)
css.html
less/mixins.less

index cf3e423b49589738497f01e6ce3d0a6cfefa1cee..fd373c4e5aee12cf448300c23b0117b76becb65b 100644 (file)
--- a/css.html
+++ b/css.html
@@ -428,8 +428,8 @@ base_url: "../"
   }
 }
 
-// Generate the columns
-.make-column(@columns; @gutter: @grid-gutter-width) {
+// Generate the extra small columns
+.make-xs-column(@columns; @gutter: @grid-gutter-width) {
   position: relative;
   // Prevent columns from collapsing when empty
   min-height: 1px;
@@ -551,11 +551,11 @@ base_url: "../"
   .make-row();
 }
 .content-main {
-  .make-column(8);
+  .make-lg-column(8);
 }
 .content-secondary {
-  .make-column(3);
-  .make-column-offset(1);
+  .make-lg-column(3);
+  .make-lg-column-offset(1);
 }
 {% endhighlight %}
 {% highlight html %}
index d6162f374ea2cd5a3111f80674ea9d8c6255a8f5..24bce6bbffd6931a6d81053b0dade78e221e0938 100644 (file)
   }
 }
 
-// Generate the default columns
-.make-column(@columns; @gutter: @grid-gutter-width) {
+// Generate the extra small columns
+.make-xs-column(@columns; @gutter: @grid-gutter-width) {
   position: relative;
   float: left;
   // Prevent columns from collapsing when empty