aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-30 17:11:55 -0700
committerMark Otto <[email protected]>2013-09-30 17:11:55 -0700
commitef66c31dd457b1faecd51410eae1d9b5d3a0b9aa (patch)
treefc7f0b64b057ce6c4f9f6d39043cc02f2440ba65
parent33673a4008fc641f0a37991c22cae267c3c65186 (diff)
parente34e73714a4a6d73145f434d74594a45d6d145a8 (diff)
downloadbootstrap-ef66c31dd457b1faecd51410eae1d9b5d3a0b9aa.tar.xz
bootstrap-ef66c31dd457b1faecd51410eae1d9b5d3a0b9aa.zip
Merge pull request #10856 from akalicki/grid_class_docs
Better documentation and optimized examples for grid classes
-rw-r--r--css.html17
1 files changed, 9 insertions, 8 deletions
diff --git a/css.html b/css.html
index 9824e9923..b34cb4b92 100644
--- a/css.html
+++ b/css.html
@@ -172,6 +172,7 @@ base_url: "../"
</tbody>
</table>
</div>
+ <p>Grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes, and override grid classes targeted at smaller devices. Therefore, applying any <code>.col-md-</code> class to an element will not only affect its styling on medium devices but also on large devices if a <code>.col-lg-</code> class is not present.</p>
<h3 id="grid-example-basic">Example: Stacked-to-horizontal</h3>
<p>Using a single set of <code>.col-md-*</code> grid classes, you can create a basic grid system that starts out stacked on mobile devices and tablet devices (the extra small to small range) before becoming horizontal on desktop (medium) devices.</p>
@@ -277,27 +278,27 @@ base_url: "../"
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="col-xs-12 col-sm-6 col-md-8">.col-xs-12 .col-sm-6 .col-md-8</div>
- <div class="col-xs-6 col-sm-6 col-md-4">.col-xs-6 .col-sm-6 .col-md-4</div>
+ <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
</div>
<div class="row show-grid">
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
<!-- Optional: clear the XS cols if their content doesn't match in height -->
<div class="clearfix visible-xs"></div>
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
</div>
</div>
{% highlight html %}
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-8">.col-xs-12 .col-sm-6 .col-md-8</div>
- <div class="col-xs-6 col-sm-6 col-md-4">.col-xs-6 .col-sm-6 .col-md-4</div>
+ <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
</div>
<div class="row">
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
<!-- Optional: clear the XS cols if their content doesn't match in height -->
<div class="clearfix visible-xs"></div>
- <div class="col-xs-6 col-sm-4 col-md-4">.col-xs-6 .col-sm-4 .col-md-4</div>
+ <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div>
</div>
{% endhighlight %}