aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 11:31:46 -0800
committerMark Otto <[email protected]>2016-02-06 11:31:46 -0800
commit95f34be0936f6309fde4d3ecb408cdffb4b0c2db (patch)
treed342761e0635617db6e3188543f3d4a2eb74456a /docs
parent414997baa83858b43e9f45af90097f93ed2d6797 (diff)
downloadbootstrap-95f34be0936f6309fde4d3ecb408cdffb4b0c2db.tar.xz
bootstrap-95f34be0936f6309fde4d3ecb408cdffb4b0c2db.zip
More grid updates
- Flexbox responsive behavior fixed with specific .col-{breakpoint} classes now added - Dropped the make-col mixin in favor of a column-basics placeholder that we can extend across our grid infrastructure - Updated docs to use required .col-xs-12 (as a safeguard for when folks enable flexbox mode--this isn't necessary in default grid mode) - Update flexbox grid docs to include responsive docs, tweak some other bits too
Diffstat (limited to 'docs')
-rw-r--r--docs/_layouts/docs.html4
-rw-r--r--docs/layout/flexbox-grid.md42
2 files changed, 32 insertions, 14 deletions
diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html
index e57dfdd3c..6e8cddf21 100644
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -21,10 +21,10 @@
<div class="container">
<div class="row">
- <div class="col-md-3 push-md-9 bd-sidebar">
+ <div class="col-xs-12 col-md-3 push-md-9 bd-sidebar">
{% include nav-docs.html %}
</div>
- <div class="col-md-9 pull-md-3 bd-content">
+ <div class="col-xs-12 col-md-9 pull-md-3 bd-content">
<h1 class="bd-title" id="content">{{ page.title }}</h1>
{{ content }}
</div>
diff --git a/docs/layout/flexbox-grid.md b/docs/layout/flexbox-grid.md
index 6faa2e78e..6d372a96c 100644
--- a/docs/layout/flexbox-grid.md
+++ b/docs/layout/flexbox-grid.md
@@ -23,37 +23,36 @@ The flexbox grid system behaves similar to our default grid system, but with a f
- [Grid mixins](/layout/grid#sass-mixins) and [predefined classes](/layout/grid#predefined-classes) include support for flexbox. Just [enable flexbox support](/getting-started/flexbox) to utilize them as you would otherwise.
- Nesting, offsets, pushes, and pulls are all supported in the flexbox grid system.
-- Flexbox grid columns without a set width will automatically layout with even widths. For example, four columns will each automatically be 25% wide.
+- Flexbox grid columns without a set width will automatically layout with equal widths. For example, four columns will each automatically be 25% wide.
- Flexbox grid columns have significantly more alignment options available, including vertical alignment.
+- Unlike the default grid system where a grid column starts as full-width in the `xs` tier, flexbox requires a `.col-{breakpoint}` class for each tier.
Chill? Awesome—keep reading for more information and some code snippets.
## Auto-layout columns
-As mentioned above, flexbox grid columns will automatically layout with even widths. Add any number of `.col-*`s for each breakpoint you need and you're good to go.
+When flexbox support is enabled, you can utilize breakpoint-specific column classes for equal-width columns. Add any number of `.col-{breakpoint}`s for each breakpoint you need and you're good to go. For example, here's are two grid layouts that apply to every device and viewport possible.
<div class="bd-example-row">
{% example html %}
<div class="container">
<div class="row">
<div class="col-xs">
- One of two columns
+ 1 of 2
</div>
<div class="col-xs">
- One of two columns
+ 1 of 2
</div>
</div>
-</div>
-<div class="container">
<div class="row">
<div class="col-xs">
- One of three columns
+ 1 of 3
</div>
<div class="col-xs">
- One of three columns
+ 1 of 3
</div>
<div class="col-xs">
- One of three columns
+ 1 of 3
</div>
</div>
</div>
@@ -67,13 +66,32 @@ Auto-layout for flexbox grid columns also means you can set the width of one col
<div class="container">
<div class="row">
<div class="col-xs">
- One of three columns
+ 1 of 3
</div>
<div class="col-xs-6">
- One of three columns
+ 2 of 3 (wider)
</div>
<div class="col-xs">
- One of three columns
+ 3 of 3
+ </div>
+ </div>
+</div>
+{% endexample %}
+</div>
+
+## Responsive flexbox
+
+Unlike the default grid system, the flexbox grid requires a class for full-width columns. If you have a `.col-sm-6` and don't add `.col-xs-12`, your `xs` grid will not render correctly. Note that flexbox grid tiers still scale up across breakpoints, so if you want two 50% wide columns across `sm`, `md`, and `lg`, you only need to set `.col-sm-6`.
+
+<div class="bd-example-row">
+{% example html %}
+<div class="container">
+ <div class="row">
+ <div class="col-xs-12 col-sm-6">
+ 1 of 2 (stacked on mobile)
+ </div>
+ <div class="col-xs-12 col-sm-6">
+ 1 of 2 (stacked on mobile)
</div>
</div>
</div>