aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-28 22:21:16 -0700
committerMark Otto <[email protected]>2013-07-28 22:21:16 -0700
commit774f173a18d93ba5e80d8c4c8207c8f961004da6 (patch)
tree488c20d04c9a641ad3656fa6c0041845bc6923c1
parentbcc6fe5b2bf6bba6a32f0a1b9bc3f129286f70fb (diff)
downloadbootstrap-774f173a18d93ba5e80d8c4c8207c8f961004da6.tar.xz
bootstrap-774f173a18d93ba5e80d8c4c8207c8f961004da6.zip
expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733)
-rw-r--r--css.html42
1 files changed, 32 insertions, 10 deletions
diff --git a/css.html b/css.html
index 095be1deb..7d53caa31 100644
--- a/css.html
+++ b/css.html
@@ -91,16 +91,20 @@ base_url: "../"
<tr>
<th></th>
<th>
- Tiny grid
+ Tiny devices
<small>Phones (&lt;480px)</small>
</th>
<th>
- Small grid
+ Small devices
<small>Tablets (&lt;768px)</small>
</th>
<th>
- Medium-large grid
- <small>Desktops (&gt;768px)</small>
+ Medium devices
+ <small>Desktops (&gt;992px)</small>
+ </th>
+ <th>
+ Large devices
+ <small>Desktops (&gt;1200px)</small>
</th>
</tr>
</thead>
@@ -108,31 +112,49 @@ base_url: "../"
<tr>
<th>Grid behavior</th>
<td>Horizontal at all times</td>
- <td colspan="2">Collapsed to start, horizontal above breakpoints</td>
+ <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
+ </tr>
+ <tr>
+ <th>Max container width</th>
+ <td>None (auto)</td>
+ <td>728px</td>
+ <td>940px</td>
+ <td>1170px</td>
</tr>
<tr>
<th>Class prefix</th>
<td><code>.col-</code></td>
<td><code>.col-sm-</code></td>
- <td><code>.col-lg-</code></td>
+ <td colspan="2"><code>.col-lg-</code></td>
</tr>
<tr>
<th># of columns</th>
- <td colspan="3">12</td>
+ <td colspan="4">12</td>
+ </tr>
+ <tr>
+ <th>Max column width</th>
+ <td>Auto</td>
+ <td>~60px</td>
+ <td>~78px</td>
+ <td>~98px</td>
+ </tr>
+ <tr>
+ <th>Gutter width</th>
+ <td colspan="4">30px (15px on each side of a column)</td>
</tr>
<tr>
<th>Nestable</th>
- <td colspan="3">Yes</td>
+ <td colspan="4">Yes</td>
</tr>
<tr>
<th>Offsets</th>
<td colspan="2" class="text-muted">N/A</td>
- <td>Yes</td>
+ <td colspan="2">Yes</td>
</tr>
<tr>
<th>Column ordering</th>
<td class="text-muted">N/A</td>
- <td colspan="2">Yes</td>
+ <td colspan="3">Yes</td>
</tr>
</tbody>
</table>