Remove map-merge (#28033)

3d350c3b · Martijn Cuppens · Mark Otto · d546cb83 · 3d350c3b
Commit 3d350c3b authored 6 years ago by Martijn Cuppens Committed by Mark Otto 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 23 deletions
+13 -23
--- 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;
+$grid-breakpoints: (
-// stylelint-disable-next-line scss/dollar-variable-default
+  xs: 0,
-$grid-breakpoints: map-merge(
+  sm: 576px,
-  (
+  md: 768px,
-    xs: 0,
+  lg: 992px,
-    sm: 576px,
+  xl: 1200px
-    md: 768px,
+) !default;
-    lg: 992px,
-    xl: 1200px
-  ),
-  $grid-breakpoints
-);
 @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;
+$container-max-widths: (
-// stylelint-disable-next-line scss/dollar-variable-default
+  sm: 540px,
-$container-max-widths: map-merge(
+  md: 720px,
-  (
+  lg: 960px,
-    sm: 540px,
+  xl: 1140px
-    md: 720px,
+) !default;
-    lg: 960px,
-    xl: 1140px
-  ),
-  $container-max-widths
-);
 @include _assert-ascending($container-max-widths, "$container-max-widths");