mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

update grid xs mixin and update docs to match new mixins

Browse Source
This commit is contained in:
Mark Otto 2013-08-12 11:52:51 -07:00
parent a09531a40e
commit abedd38c5b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css.html
View File

@ -428,8 +428,8 @@ base_url: "../"
} }
} }
// Generate the columns // Generate the extra small columns
.make-column(@columns; @gutter: @grid-gutter-width) { .make-xs-column(@columns; @gutter: @grid-gutter-width) {
position: relative; position: relative;
// Prevent columns from collapsing when empty // Prevent columns from collapsing when empty
min-height: 1px; min-height: 1px;
@ -551,11 +551,11 @@ base_url: "../"
.make-row(); .make-row();
} }
.content-main { .content-main {
.make-column(8); .make-lg-column(8);
} }
.content-secondary { .content-secondary {
.make-column(3); .make-lg-column(3);
.make-column-offset(1); .make-lg-column-offset(1);
} }
{% endhighlight %} {% endhighlight %}
{% highlight html %} {% highlight html %}

4
less/mixins.less
View File

@ -469,8 +469,8 @@
} }
} }
// Generate the default columns // Generate the extra small columns
.make-column(@columns; @gutter: @grid-gutter-width) { .make-xs-column(@columns; @gutter: @grid-gutter-width) {
position: relative; position: relative;
float: left; float: left;
// Prevent columns from collapsing when empty // Prevent columns from collapsing when empty