From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 18:52:51 +0000 (-0700)
Subject: update grid xs mixin and update docs to match new mixins
X-Git-Tag: v3.0.0-rc.2~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abedd38c5b4f7f9e9abfd7528b9e7679cbd46fc2;p=thirdparty%2Fbootstrap.git

update grid xs mixin and update docs to match new mixins
---

diff --git a/css.html b/css.html
index cf3e423b49..fd373c4e5a 100644
--- 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 %}
diff --git a/less/mixins.less b/less/mixins.less
index d6162f374e..24bce6bbff 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -469,8 +469,8 @@
   }
 }
 
-// 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