Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docs: Make the grid values back from v4 #1440

Merged
merged 3 commits into from
Aug 25, 2022
Merged

Docs: Make the grid values back from v4 #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecd870f
Re-enter values back from v4
louismaximepiton Aug 5, 2022
90f3d02
Fixes from review
louismaximepiton Aug 24, 2022
da70bb2
Merge branch 'main' into main-lmp-grid-options-fix
julien-deramond Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion site/content/docs/5.2/layout/containers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ See them in action and compare them in our [Grid example]({{< docsref "/examples
Please note that we apply an extra-padding on our containers (see [our mixins](#mixins))

{{< bs-table "table" >}}
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
| | Extra small<div class="fw-normal">&lt;576px</div> | Small<div class="fw-normal">&ge;576px</div> | Medium<div class="fw-normal">&ge;768px</div> | Large<div class="fw-normal">&ge;992px</div> | X-Large<div class="fw-normal">&ge;1200px</div> | XX-Large<div class="fw-normal">&ge;1400px</div> |
| | Extra small<div class="fw-normal">&lt;480px</div> | Small<div class="fw-normal">&ge;480px</div> | Medium<div class="fw-normal">&ge;768px</div> | Large<div class="fw-normal">&ge;1024px</div> | X-Large<div class="fw-normal">&ge;1280px</div> | XX-Large<div class="fw-normal">&ge;1440px</div> |
| --- | --- | --- | --- | --- | --- | --- |
| `.container` | <span class="text-muted">312px</span> | 468px | 744px | 960px | 1200px | 1320px |
| `.container-sm` | <span class="text-muted">100vw -<br/>(2 * 4px)</span> | 468px | 744px | 960px | 1200px | 1320px |
Expand Down
24 changes: 17 additions & 7 deletions site/content/docs/5.2/layout/grid.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ As noted above, each of these breakpoints have their own container, unique class
<tbody>
<tr>
<th class="text-nowrap" scope="row">Container <code class="fw-normal">max-width</code></th>
<td>320px</td>
<td>480px</td>
<td>768px</td>
<td>1024px</td>
<td>1280px</td>
<td>1440px</td>
<td>312px</td>
<td>468px</td>
<td>744px</td>
<td>960px</td>
<td>1200px</td>
<td>1320px</td>
</tr>
<tr>
<th class="text-nowrap" scope="row">Class prefix</th>
Expand All @@ -117,9 +117,19 @@ As noted above, each of these breakpoints have their own container, unique class
<th class="text-nowrap" scope="row"># of columns</th>
<td colspan="6">12</td>
</tr>
<tr>
<th class="text-nowrap" scope="row">Column width</th>
<td>16px</td>
<td>29px</td>
<td>42px</td>
<td>60px</td>
<td>80px</td>
<td>90px</td>
</tr>
<tr>
<th class="text-nowrap" scope="row">Gutter width</th>
<td colspan="6">1.5rem (.75rem on left and right)</td>
<td colspan="2">.625rem (.3125rem on left and right)</td>
<td colspan="4">1.25rem (.625rem on left and right)</td>
</tr>
<tr>
<th class="text-nowrap" scope="row">Custom gutters</th>
Expand Down