diff options
| author | Mark Otto <[email protected]> | 2015-08-20 21:09:19 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-20 21:09:19 -0700 |
| commit | bf2781d758e8ef98ea9d0c82f8be84b12ab5bca4 (patch) | |
| tree | 6f31e6f53f3c2ff7ca7ed509e81026bbe103e515 /docs | |
| parent | c961723184b672e571800df86b110dd72a7cd4e1 (diff) | |
| parent | ca9fdcee9cf420c7e1654da2674f7fc24fd1ecbf (diff) | |
| download | bootstrap-bf2781d758e8ef98ea9d0c82f8be84b12ab5bca4.tar.xz bootstrap-bf2781d758e8ef98ea9d0c82f8be84b12ab5bca4.zip | |
Merge pull request #17146 from kkirsche/patch-13
v4 - Add pixel values for the rem breakpoints and column sizes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/layout/grid.md | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/docs/layout/grid.md b/docs/layout/grid.md index 7b725ea84..426cf412c 100644 --- a/docs/layout/grid.md +++ b/docs/layout/grid.md @@ -61,23 +61,23 @@ See how aspects of the Bootstrap grid system work across multiple devices with a <th></th> <th> Extra small - <small><34em</small> + <small><34em / 480px</small> </th> <th> Small - <small>≥34em</small> + <small>≥34em / 480px</small> </th> <th> Medium - <small>≥48em</small> + <small>≥45em / 720px</small> </th> <th> Large - <small>≥62em</small> + <small>≥62em / 992px</small> </th> <th> Extra large - <small>≥75em</small> + <small>≥75em / 1200px</small> </th> </tr> </thead> @@ -90,10 +90,10 @@ 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>34rem</td> - <td>45rem</td> - <td>60rem</td> - <td>72.25rem</td> + <td>34rem / 480px</td> + <td>45rem / 720px</td> + <td>60rem / 960px</td> + <td>72.25rem / 1156px</td> </tr> <tr> <th class="text-nowrap" scope="row">Class prefix</th> @@ -140,13 +140,13 @@ $grid-breakpoints: ( // Extra small screen / phone xs: 0, // Small screen / phone - sm: 34em, + sm: 34em, // 480px // Medium screen / tablet - md: 48em, + md: 48em, // 768px // Large screen / desktop - lg: 62em, + lg: 62em, // 992px // Extra large screen / wide desktop - xl: 75em + xl: 75em // 1200px ) !default; $grid-columns: 12; |