diff options
| author | Martijn Cuppens <martijn.cuppens@gmail.com> | 2019-01-14 03:35:00 +0300 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2019-01-14 03:35:00 +0300 |
| commit | 3d350c3b3454781988948512bf4a9eb6e13f0be1 (patch) | |
| tree | 8fd7851b4506046c2e8cbf95094c4e1097aafdd9 /scss | |
| parent | d546cb8374e49c8aa3be57e312e776eea06e0008 (diff) | |
Remove map-merge (#28033)
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_variables.scss | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss index 7731d2deb5..6aea5e9814 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -186,18 +186,13 @@ $paragraph-margin-bottom: 1rem !default; // Define the minimum dimensions at which your layout will change, // adapting to different screen sizes, for use in media queries. -$grid-breakpoints: () !default; -// stylelint-disable-next-line scss/dollar-variable-default -$grid-breakpoints: map-merge( - ( - xs: 0, - sm: 576px, - md: 768px, - lg: 992px, - xl: 1200px - ), - $grid-breakpoints -); +$grid-breakpoints: ( + xs: 0, + sm: 576px, + md: 768px, + lg: 992px, + xl: 1200px +) !default; @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); @include _assert-starts-at-zero($grid-breakpoints); @@ -207,17 +202,12 @@ $grid-breakpoints: map-merge( // // Define the maximum width of `.container` for different screen sizes. -$container-max-widths: () !default; -// stylelint-disable-next-line scss/dollar-variable-default -$container-max-widths: map-merge( - ( - sm: 540px, - md: 720px, - lg: 960px, - xl: 1140px - ), - $container-max-widths -); +$container-max-widths: ( + sm: 540px, + md: 720px, + lg: 960px, + xl: 1140px +) !default; @include _assert-ascending($container-max-widths, "$container-max-widths"); |