aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-12 11:52:51 -0700
committerMark Otto <[email protected]>2013-08-12 11:52:51 -0700
commitabedd38c5b4f7f9e9abfd7528b9e7679cbd46fc2 (patch)
tree222325a4d319c59b30f58d32fcc8d158faaed9c5
parenta09531a40e8d892b49e5b3b630fa53f1926a4286 (diff)
downloadbootstrap-abedd38c5b4f7f9e9abfd7528b9e7679cbd46fc2.tar.xz
bootstrap-abedd38c5b4f7f9e9abfd7528b9e7679cbd46fc2.zip
update grid xs mixin and update docs to match new mixins
-rw-r--r--css.html10
-rw-r--r--less/mixins.less4
2 files changed, 7 insertions, 7 deletions
diff --git a/css.html b/css.html
index cf3e423b4..fd373c4e5 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 d6162f374..24bce6bbf 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