Use pull request #11145 from DanielRuf/fix/block-grid-breakpoints-margins-11121 for...

6163a03fd fix: use the right breakpoints in block-grid for gutter calculation
0f6659c17 chore: use short named mixin parameters
8febe20fb chore: revert settings file
f542435e8 chore: document $breakpoint variable in xy-grid-layout, set null as default for $breakpoint

Co-Authored-By: Daniel Ruf <daniel.ruf@ueberbit.de>
Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index 8a77de9f3921d0ee71b82284a360ffc4f47686c6..fb447f895609c0647e4e56167bebe48bd36d8ec6 100644 (file)
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -95,7 +95,7 @@ $global-menu-nested-margin: 1rem;
 $global-text-direction: ltr;
 $global-flexbox: true;
 $global-prototype-breakpoints: false;
-$global-button-cursor: auto;
+$global-button-cursor: pointer;
 $global-color-pick-contrast-tolerance: 0;
 $print-transparent-backgrounds: true;
 

diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss
index 3cc45a5b0c20edd653b4c24cfc03b71cc08ce119..c967c70bb0fa7ae9435d07fd0aa1021d40dacb48 100644 (file)
--- a/scss/xy-grid/_classes.scss
+++ b/scss/xy-grid/_classes.scss
@@ -188,7 +188,7 @@
     @include -zf-each-breakpoint {
       @for $i from 1 through $xy-block-grid-max {
         .#{$-zf-size}-up-#{$i} {
-          @include xy-grid-layout($i, '.cell', false, $gutter-type: padding);
+          @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: padding, $breakpoint: $-zf-size);
         }
       }
     }
@@ -203,7 +203,7 @@
           @each $bp in -zf-breakpoints-less-than($-zf-size) {
             @if(map-has-key($grid-margin-gutters, $bp)) {
               .grid-margin-x.#{$bp}-up-#{$i} {
-                @include xy-grid-layout($i, '.cell', false, $gutter-type: margin, $breakpoint: $bp);
+                @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: margin, $breakpoint: $-zf-size);
               }
             }
           }
@@ -211,7 +211,7 @@
       }
       @for $i from 1 through $xy-block-grid-max {
         .grid-margin-x.#{$-zf-size}-up-#{$i} {
-          @include xy-grid-layout($i, '.cell', false, $gutter-type: margin, $breakpoint: $-zf-size);
+          @include xy-grid-layout($n: $i, $selector: '.cell', $gutter-output: false, $gutter-type: margin, $breakpoint: $-zf-size);
         }
       }
     }

diff --git a/scss/xy-grid/_layout.scss b/scss/xy-grid/_layout.scss
index 3b7650e32133740e2ef4141933e511b26b8ce5ec..f8c962fcd02dbcb4eccb0e0c58fe56ab35b63d9b 100644 (file)
--- a/scss/xy-grid/_layout.scss
+++ b/scss/xy-grid/_layout.scss
@@ -14,6 +14,7 @@
 /// @param {Number|Map} $gutters [$grid-margin-gutters] - Map or single value for gutters.
 /// @param {Keyword} $gutter-type [margin] - Type of gutter to output. Accepts `margin` or `padding`.
 /// @param {List} $gutter-position [right left] - The position to apply gutters to. Accepts `top`, `bottom`, `left`, `right` in any combination.
+/// @param {String} $breakpoint [null] - The breakpoint to use for the cell generation.
 /// @param {Boolean} $vertical [false] - Set to true to output vertical (height) styles rather than widths.
 @mixin xy-grid-layout(
   $n,
@@ -22,7 +23,7 @@
   $gutters: $grid-margin-gutters,
   $gutter-type: margin,
   $gutter-position: right left,
-  $breakpoint: $-zf-zero-breakpoint,
+  $breakpoint: null,
   $vertical: false
 ) {
   $size: percentage(1/$n);