Use pull request #11472 from ncoden/fix/xy-grid-offset-zero-margin-11471 for v6.5.0

281e4a8c9 fix: fix generated offset for zero gutters in "xy-cell-offset" #11471
c07d3d99a fix: fix offset calculation in "xy-cell-offset"

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/scss/xy-grid/_position.scss b/scss/xy-grid/_position.scss
index 2f930f22b65eafde4d1dd59e8ac6e37e4c72f757..336275de5bdfb3bdec4e919b3634843611991e08 100644 (file)
--- a/scss/xy-grid/_position.scss
+++ b/scss/xy-grid/_position.scss
@@ -24,7 +24,8 @@
 
   @include -zf-breakpoint-value($breakpoint, $gutters) {
     $gutter: rem-calc($-zf-bp-value) / 2;
-    $size: if($gutter-type == 'margin', calc(#{xy-cell-size($n)} + #{$gutter}), #{xy-cell-size($n)});
+    $gutter-margin: if($gutter-type == 'margin', $gutter, 0);
+    $size: if($gutter-margin == 0, #{xy-cell-size($n)}, calc(#{xy-cell-size($n)} + #{$gutter-margin}));
 
     margin-#{$direction}: #{$size};
   }