aboutsummaryrefslogtreecommitdiff
path: root/docs/layout/grid.md
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-01-04 12:22:06 -0500
committerPierre-Denis Vanduynslager <[email protected]>2017-01-04 12:22:06 -0500
commitc4867cfedb6235708967aa8518c59ffed2816f0b (patch)
treec7be6d18ee7c7a61f319bccacc035b9952171db1 /docs/layout/grid.md
parent425d156df27fa6c18e979aa000bfe5a346ee3450 (diff)
parent1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff)
downloadbootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz
bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts: # js/src/dropdown.js
Diffstat (limited to 'docs/layout/grid.md')
-rw-r--r--docs/layout/grid.md142
1 files changed, 70 insertions, 72 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index 056561b27..d0f5b2326 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -57,78 +57,76 @@ While Bootstrap uses `em`s or `rem`s for defining most sizes, `px`s are used for
See how aspects of the Bootstrap grid system work across multiple devices with a handy table.
-<div class="table-responsive">
- <table class="table table-bordered table-striped">
- <thead>
- <tr>
- <th></th>
- <th class="text-center">
- Extra small<br>
- <small>&lt;576px</small>
- </th>
- <th class="text-center">
- Small<br>
- <small>&ge;576px</small>
- </th>
- <th class="text-center">
- Medium<br>
- <small>&ge;768px</small>
- </th>
- <th class="text-center">
- Large<br>
- <small>&ge;992px</small>
- </th>
- <th class="text-center">
- Extra large<br>
- <small>&ge;1200px</small>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <th class="text-nowrap" scope="row">Grid behavior</th>
- <td>Horizontal at all times</td>
- <td colspan="4">Collapsed to start, horizontal above breakpoints</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Max container width</th>
- <td>None (auto)</td>
- <td>540px</td>
- <td>720px</td>
- <td>960px</td>
- <td>1140px</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Class prefix</th>
- <td><code>.col-</code></td>
- <td><code>.col-sm-</code></td>
- <td><code>.col-md-</code></td>
- <td><code>.col-lg-</code></td>
- <td><code>.col-xl-</code></td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row"># of columns</th>
- <td colspan="5">12</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Gutter width</th>
- <td colspan="5">30px (15px on each side of a column)</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Nestable</th>
- <td colspan="5">Yes</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Offsets</th>
- <td colspan="5">Yes</td>
- </tr>
- <tr>
- <th class="text-nowrap" scope="row">Column ordering</th>
- <td colspan="5">Yes</td>
- </tr>
- </tbody>
- </table>
-</div>
+<table class="table table-bordered table-striped table-responsive">
+ <thead>
+ <tr>
+ <th></th>
+ <th class="text-center">
+ Extra small<br>
+ <small>&lt;576px</small>
+ </th>
+ <th class="text-center">
+ Small<br>
+ <small>&ge;576px</small>
+ </th>
+ <th class="text-center">
+ Medium<br>
+ <small>&ge;768px</small>
+ </th>
+ <th class="text-center">
+ Large<br>
+ <small>&ge;992px</small>
+ </th>
+ <th class="text-center">
+ Extra large<br>
+ <small>&ge;1200px</small>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th class="text-nowrap" scope="row">Grid behavior</th>
+ <td>Horizontal at all times</td>
+ <td colspan="4">Collapsed to start, horizontal above breakpoints</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Max container width</th>
+ <td>None (auto)</td>
+ <td>540px</td>
+ <td>720px</td>
+ <td>960px</td>
+ <td>1140px</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Class prefix</th>
+ <td><code>.col-</code></td>
+ <td><code>.col-sm-</code></td>
+ <td><code>.col-md-</code></td>
+ <td><code>.col-lg-</code></td>
+ <td><code>.col-xl-</code></td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row"># of columns</th>
+ <td colspan="5">12</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Gutter width</th>
+ <td colspan="5">30px (15px on each side of a column)</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Nestable</th>
+ <td colspan="5">Yes</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Offsets</th>
+ <td colspan="5">Yes</td>
+ </tr>
+ <tr>
+ <th class="text-nowrap" scope="row">Column ordering</th>
+ <td colspan="5">Yes</td>
+ </tr>
+ </tbody>
+</table>
## Auto-layout columns