aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-09 14:52:14 -0700
committerGitHub <[email protected]>2016-10-09 14:52:14 -0700
commitb6fe0d45a4faf80fb98a21d638ca5551e2117c9c (patch)
tree9d52aace918b401bd2b78edc55bc30b1b356be8c /docs
parentf49a7a2a0830ced28c5dbd8f94e04ad2f9d7425d (diff)
parent13cc81c50c473c78e96dc8f5c815782afd81d3b9 (diff)
downloadbootstrap-b6fe0d45a4faf80fb98a21d638ca5551e2117c9c.tar.xz
bootstrap-b6fe0d45a4faf80fb98a21d638ca5551e2117c9c.zip
Merge pull request #20865 from twbs/v4-container-widths
v4: Grid adjustments
Diffstat (limited to 'docs')
-rw-r--r--docs/layout/grid.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md
index 26ff36c41..5d37880c0 100644
--- a/docs/layout/grid.md
+++ b/docs/layout/grid.md
@@ -64,11 +64,11 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
<th></th>
<th class="text-xs-center">
Extra small<br>
- <small>&lt;544px</small>
+ <small>&lt;576px</small>
</th>
<th class="text-xs-center">
Small<br>
- <small>&ge;544px</small>
+ <small>&ge;576px</small>
</th>
<th class="text-xs-center">
Medium<br>
@@ -93,9 +93,9 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
<tr>
<th class="text-nowrap" scope="row">Container width</th>
<td>None (auto)</td>
- <td>576px</td>
+ <td>540px</td>
<td>720px</td>
- <td>940px</td>
+ <td>960px</td>
<td>1140px</td>
</tr>
<tr>
@@ -112,7 +112,7 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
</tr>
<tr>
<th class="text-nowrap" scope="row">Gutter width</th>
- <td colspan="5">1.875rem / 30px (15px on each side of a column)</td>
+ <td colspan="5">30px (15px on each side of a column)</td>
</tr>
<tr>
<th class="text-nowrap" scope="row">Nestable</th>
@@ -154,7 +154,7 @@ $grid-breakpoints: (
// Extra small screen / phone
xs: 0,
// Small screen / phone
- sm: 544px,
+ sm: 576px,
// Medium screen / tablet
md: 768px,
// Large screen / desktop
@@ -164,9 +164,9 @@ $grid-breakpoints: (
);
$container-max-widths: (
- sm: 576px,
+ sm: 540px,
md: 720px,
- lg: 940px,
+ lg: 960px,
xl: 1140px
);
{% endhighlight %}
@@ -512,7 +512,7 @@ $grid-breakpoints: (
$container-max-widths: (
sm: 420px,
md: 720px,
- lg: 940px
+ lg: 960px
);
{% endhighlight %}