From f85944874e28c074d71869d0eb0a52069e085f14 Mon Sep 17 00:00:00 2001 From: Stanley Lim Date: Sun, 6 Aug 2023 04:00:14 -0700 Subject: [PATCH] :bug: fix(_generator.scss): Forward missing override parameter --- src/base/spacing.scss | 2 +- src/internal/_generator.scss | 12 ++++++------ tests/internal/_generator.spec.scss | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/base/spacing.scss b/src/base/spacing.scss index b43a157f..d0d445e7 100644 --- a/src/base/spacing.scss +++ b/src/base/spacing.scss @@ -1,7 +1,7 @@ @use '../internal' as *; @include utility-with-body($prefix: '', $generate-viewports: 'true', $override: '!important') using - ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix) { + ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override) { @each $class, $size in $spacing-system { /* Margin */ .#{$variant-prefix}#{$prefix}m#{$delimiter}#{$class}#{$suffix-str} #{$variant-suffix}{ diff --git a/src/internal/_generator.scss b/src/internal/_generator.scss index 64b9d3fc..1325646a 100644 --- a/src/internal/_generator.scss +++ b/src/internal/_generator.scss @@ -48,8 +48,8 @@ $default-variant-delimiter: '\\:'; $value, $override ) - using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix) { - @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix); + using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override) { + @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override); } } } @@ -88,7 +88,7 @@ $default-variant-delimiter: '\\:'; $value, $override ) - using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix) { + using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override) { .#{$variant-prefix}#{$prefix}#{$common-class}#{$key}#{$suffix-str}#{$variant-suffix} { @include mixins.explode-properties($value, $override); } @@ -159,7 +159,7 @@ $default-variant-delimiter: '\\:'; } @media (prefers-color-scheme: #{$variant}) { - @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix); + @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override); } } @else if $variant == 'reduce-motion' { $variant-prefix: ''; @@ -174,7 +174,7 @@ $default-variant-delimiter: '\\:'; } @media (prefers-reduced-motion: reduce) { - @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix); + @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override); } } @else { $variant-prefix: ''; @@ -189,7 +189,7 @@ $default-variant-delimiter: '\\:'; $suffix-str: $delimiter + $suffix; } - @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix); + @content ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override); } } diff --git a/tests/internal/_generator.spec.scss b/tests/internal/_generator.spec.scss index d83ea1ae..5d7ddfd7 100644 --- a/tests/internal/_generator.spec.scss +++ b/tests/internal/_generator.spec.scss @@ -150,11 +150,11 @@ $generate-viewports: 'true', $override: '!important' ) - using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix) { + using ($variant-prefix, $prefix, $common-class, $delimiter, $key, $suffix-str, $variant-suffix, $override) { $colors: red, white; @each $color in $colors { .#{$variant-prefix}#{$prefix}#{$color}#{$suffix-str}#{$variant-suffix} { - color: #{$color} !important; + color: #{$color} #{$override}; } } }