1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 03:41:19 +02:00

Change grid and container sizes to px

Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
This commit is contained in:
Gleb Mazovetskiy
2015-08-31 01:23:43 +01:00
parent 3497d9937a
commit eabed0edf8
4 changed files with 56 additions and 47 deletions

View File

@@ -90,13 +90,13 @@ $grid-breakpoints: (
// Extra small screen / phone
xs: 0,
// Small screen / phone
sm: 34em,
sm: 544px,
// Medium screen / tablet
md: 48em,
md: 768px,
// Large screen / desktop
lg: 62em,
lg: 992px,
// Extra large screen / wide desktop
xl: 75em
xl: 1200px
) !default;
@@ -105,10 +105,10 @@ $grid-breakpoints: (
// Define the maximum width of `.container` for different screen sizes.
$container-max-widths: (
sm: 34rem, // 480
md: 45rem, // 720
lg: 60rem, // 960
xl: 72.25rem // 1140
sm: 576px,
md: 720px,
lg: 940px,
xl: 1140px
) !default;