0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-28 00:54:30 +01:00

Merge pull request #17146 from kkirsche/patch-13

v4 - Add pixel values for the rem breakpoints and column sizes
This commit is contained in:
Mark Otto 2015-08-20 21:09:19 -07:00
commit bf2781d758

View File

@ -61,23 +61,23 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
<th></th> <th></th>
<th> <th>
Extra small Extra small
<small>&lt;34em</small> <small>&lt;34em / 480px</small>
</th> </th>
<th> <th>
Small Small
<small>&ge;34em</small> <small>&ge;34em / 480px</small>
</th> </th>
<th> <th>
Medium Medium
<small>&ge;48em</small> <small>&ge;45em / 720px</small>
</th> </th>
<th> <th>
Large Large
<small>&ge;62em</small> <small>&ge;62em / 992px</small>
</th> </th>
<th> <th>
Extra large Extra large
<small>&ge;75em</small> <small>&ge;75em / 1200px</small>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -90,10 +90,10 @@ See how aspects of the Bootstrap grid system work across multiple devices with a
<tr> <tr>
<th class="text-nowrap" scope="row">Container width</th> <th class="text-nowrap" scope="row">Container width</th>
<td>None (auto)</td> <td>None (auto)</td>
<td>34rem</td> <td>34rem / 480px</td>
<td>45rem</td> <td>45rem / 720px</td>
<td>60rem</td> <td>60rem / 960px</td>
<td>72.25rem</td> <td>72.25rem / 1156px</td>
</tr> </tr>
<tr> <tr>
<th class="text-nowrap" scope="row">Class prefix</th> <th class="text-nowrap" scope="row">Class prefix</th>
@ -140,13 +140,13 @@ $grid-breakpoints: (
// Extra small screen / phone // Extra small screen / phone
xs: 0, xs: 0,
// Small screen / phone // Small screen / phone
sm: 34em, sm: 34em, // 480px
// Medium screen / tablet // Medium screen / tablet
md: 48em, md: 48em, // 768px
// Large screen / desktop // Large screen / desktop
lg: 62em, lg: 62em, // 992px
// Extra large screen / wide desktop // Extra large screen / wide desktop
xl: 75em xl: 75em // 1200px
) !default; ) !default;
$grid-columns: 12; $grid-columns: 12;