Skip to content

chore (scss): replace all deprecated rules in latest dart sass changes #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@
"postcss-scss": "^4.0.6",
"postcss-sort-media-queries": "^5.2.0",
"prettier": "^2.2.1",
"sass": "^1.52.3",
"sass-loader": "^11.0.1",
"sass": "^1.85.1",
"sass-loader": "^16.0.5",
"sharp": "^0.32.1",
"style-loader": "^2.0.0",
"stylelint": "^14.13.0",
2 changes: 2 additions & 0 deletions src/scss/01-abstract/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@use "sass:map";
@use "sass:math";

$entry-file-name: "undefined";

/**
* Variables
*/
2 changes: 0 additions & 2 deletions src/scss/01-abstract/abstract.scss

This file was deleted.

9 changes: 6 additions & 3 deletions src/scss/02-tools/_f-column.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "sass:meta";
@use "../01-abstract/variables" as *;

@use "sass:map";
@use "sass:math";

@@ -68,7 +71,7 @@

@function column($device, $nb-column: null, $nb-gutter: null, $total-column: null, $total-gutter: null) {
// shift vars if $device is number
@if type-of($device) == "number" {
@if meta.type-of($device) == "number" {
$total-gutter: $total-column;
$total-column: $nb-gutter;
$nb-gutter: $nb-column;
@@ -98,7 +101,7 @@

@function column-px($device, $nb-column: null, $nb-gutter: null, $unitless: false) {
// shift vars if $device is number
@if type-of($device) == "number" {
@if meta.type-of($device) == "number" {
$nb-gutter: $nb-column;
$nb-column: $device;
$device: d;
@@ -125,7 +128,7 @@

@function column-full($device, $nb-column: null, $nb-gutter: null) {
// shift vars if $device is number
@if type-of($device) == "number" {
@if meta.type-of($device) == "number" {
$nb-gutter: $nb-column;
$nb-column: $device;
$device: d;
2 changes: 2 additions & 0 deletions src/scss/02-tools/_f-context-align.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../01-abstract/variables" as *;

/**
* Align - Make a context align (editor / style)
*
7 changes: 5 additions & 2 deletions src/scss/02-tools/_f-context-selector.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "sass:meta";
@use "../01-abstract/variables" as *;

/**
* Context selector - Make a context selector (editor / style)
*
@@ -61,9 +64,9 @@
@return $selector;
}

@if (type-of($selector) == "string") {
@if (meta.type-of($selector) == "string") {
$full-selector: $parent + " " + $selector;
} @else if (type-of($selector) == "list") {
} @else if (meta.type-of($selector) == "list") {
@each $s in $selector {
$full-selector: $full-selector + $parent + " " + $s;
}
7 changes: 5 additions & 2 deletions src/scss/02-tools/_f-em.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "f-strip-units" as *;

@use "sass:math";

/**
@@ -22,11 +25,11 @@

@function em($pxval, $base: $font-size-base) {

@if not unitless($pxval) {
@if not math.is-unitless($pxval) {
$pxval: strip-units($pxval);
}

@if not unitless($base) {
@if not math.is-unitless($base) {
$base: strip-units($base);
}

3 changes: 3 additions & 0 deletions src/scss/02-tools/_f-fluid-size.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "f-strip-units" as *;

/**
* Fluid size
*
1 change: 1 addition & 0 deletions src/scss/02-tools/_f-get-gutter-width.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "../01-abstract/variables" as *;
@use "sass:map";

/**
9 changes: 6 additions & 3 deletions src/scss/02-tools/_f-get-svg-url.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "sass:color";
@use "sass:list";
@use "sass:map";

/**
@@ -40,7 +43,7 @@
"close": ("0 0 20 20", "3Cpath d='M5.442 5.442 5 5.883l2.058 2.059L9.116 10l-2.058 2.058L5 14.117l.442.441.441.442 2.059-2.058L10 10.884l2.058 2.058L14.117 15l.441-.442.442-.441-2.058-2.059L10.884 10l2.058-2.058L15 5.883l-.442-.441L14.117 5l-2.059 2.058L10 9.116 7.942 7.058 5.883 5l-.441.442'/%3E"),
);

@if not map-has-key($svgs, $name) {
@if not map.has-key($svgs, $name) {
@return "";
}

@@ -49,8 +52,8 @@
}

@if ($fill != "") {
$fill: " fill='rgba(#{red($fill), green($fill), blue($fill), $opacity})'";
$fill: " fill='rgba(#{color.channel($fill, 'red'), color.channel($fill, 'green'), color.channel($fill, 'blue'), $opacity})'";
}

@return url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg'" + $fill + $style + " viewBox='" + nth(map.get($svgs, $name), 1) + "'%3E%" + nth(map.get($svgs, $name), 2) + "%3C/svg%3E"); /* stylelint-disable-line */
@return url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg'" + $fill + $style + " viewBox='" + list.nth(map.get($svgs, $name), 1) + "'%3E%" + list.nth(map.get($svgs, $name), 2) + "%3C/svg%3E"); /* stylelint-disable-line */
}
3 changes: 3 additions & 0 deletions src/scss/02-tools/_m-bg-fullwidth.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "m-style-only" as *;

/**
* Background fullwidth - Make a fullwidth background in a container element
*
4 changes: 3 additions & 1 deletion src/scss/02-tools/_m-block-vertical-spacing.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "f-context-selector";

/**
* Block vertical spacing
*/
@@ -22,7 +24,7 @@
*
*/
@mixin block-vertical-spacing($type : margin, $spacing : var(--spacing--block-3)) {
#{context-selector(".blocks-container > &", ".is-root-container > &, .is-root-container > .wp-block[data-align] > &, .is-root-container > .acf-block-preview > &, .is-root-container > .wp-block-beapi-dynamic-block &, .is-root-container > .wp-block-beapi-manual-block &, .is-root-container > .wp-block[data-align] > .acf-block-preview > &, .is-root-container > .wp-block[data-align] > .wp-block-beapi-dynamic-block &, .is-root-container > .wp-block[data-align] > .wp-block-beapi-manual-block &")} {
#{f-context-selector.context-selector(".blocks-container > &", ".is-root-container > &, .is-root-container > .wp-block[data-align] > &, .is-root-container > .acf-block-preview > &, .is-root-container > .wp-block-beapi-dynamic-block &, .is-root-container > .wp-block-beapi-manual-block &, .is-root-container > .wp-block[data-align] > .acf-block-preview > &, .is-root-container > .wp-block[data-align] > .wp-block-beapi-dynamic-block &, .is-root-container > .wp-block[data-align] > .wp-block-beapi-manual-block &")} {
#{$type}-top: $spacing;
#{$type}-bottom: $spacing;

6 changes: 5 additions & 1 deletion src/scss/02-tools/_m-breakpoint.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "sass:meta";
@use "../01-abstract/variables" as *;
@use "f-em" as *;

@use "sass:map";

/**
@@ -24,7 +28,7 @@
@mixin breakpoints($breakpoint, $min-or-max-or-breakpoint: min) {
$font-size: 16px; // don't use em function whitout param, $font-size-base can be modified

@if (type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {
@if (meta.type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {

@media screen and (min-width: em(map.get($breakpoints, $breakpoint), $font-size)) and (max-width: em(map.get($breakpoints, $min-or-max-or-breakpoint) - 1, $font-size)) {
@content;
3 changes: 3 additions & 0 deletions src/scss/02-tools/_m-btn.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "m-hover" as *;

/**
* Button - All mixins for buttons - Used in src/scss/05-components/_btn.scss
*
4 changes: 4 additions & 0 deletions src/scss/02-tools/_m-checkbox-custom.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "../01-abstract/variables" as *;
@use "m-rtl" as *;
@use "m-sr-only" as *;

@use "sass:math";

/**
6 changes: 5 additions & 1 deletion src/scss/02-tools/_m-container-query.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use "sass:meta";
@use "../01-abstract/variables" as *;
@use "f-em" as *;

@use "sass:map";

/**
@@ -25,7 +29,7 @@
@mixin container-query($breakpoint, $min-or-max-or-breakpoint: min, $container-name: "") {
$font-size: 16px; // don't use em function whitout param, $font-size-base can be modified

@if (type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {
@if (meta.type-of(map.get($breakpoints, $min-or-max-or-breakpoint)) == "number") {

@container #{$container-name} (min-width: #{em(map.get($breakpoints, $breakpoint), $font-size)}) and (max-width: #{em(map.get($breakpoints, $min-or-max-or-breakpoint) - 1, $font-size)}) {

2 changes: 2 additions & 0 deletions src/scss/02-tools/_m-container.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../01-abstract/variables" as *;

/**
* Container
*
2 changes: 2 additions & 0 deletions src/scss/02-tools/_m-editor-only.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../01-abstract/variables" as *;

/**
* Editor style only
*
2 changes: 2 additions & 0 deletions src/scss/02-tools/_m-heading.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../01-abstract/variables" as *;

/**
* Heading - Used in src/scss/06-blocks/core/_heading.scss
*
5 changes: 3 additions & 2 deletions src/scss/02-tools/_m-hover.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:meta";
@use "sass:list";

/**
@@ -44,10 +45,10 @@
$selectors: "&:hover", "&:active", "&:focus";

@if ($additionalSelectors) {
@if (type-of($additionalSelectors) == "string") {
@if (meta.type-of($additionalSelectors) == "string") {
$selectors: $selectors "," $additionalSelectors;
}
@else if (type-of($additionalSelectors) == "list") {
@else if (meta.type-of($additionalSelectors) == "list") {
$selectors: list.join($selectors, $additionalSelectors, comma);
}
}
4 changes: 3 additions & 1 deletion src/scss/02-tools/_m-not-acf.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "f-context-selector";

/**
* Not apply style to ACF fields
*
@@ -14,7 +16,7 @@
*/

@mixin not-acf() {
#{context-selector(":where(body)", ":where(*:not([class*="acf-"])) >")} {
#{f-context-selector.context-selector(":where(body)", ":where(*:not([class*="acf-"])) >")} {
@content;
}
}
7 changes: 5 additions & 2 deletions src/scss/02-tools/_m-radio-custom.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "m-checkbox-custom";

@use "sass:math";

/**
@@ -28,7 +31,7 @@

@mixin radio-custom($include-checkbox-style: false, $color: $color-primary, $size: 18px, $border-width: 1px) {
@if ($include-checkbox-style) {
@include checkbox-custom($color, $size, $border-width);
@include m-checkbox-custom.checkbox-custom($color, $size, $border-width);
}

+ label {
@@ -48,5 +51,5 @@
}

@mixin radio-custom-checked() {
@include checkbox-custom-checked;
@include m-checkbox-custom.checkbox-custom-checked;
}
4 changes: 3 additions & 1 deletion src/scss/02-tools/_m-scrollbar.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "m-hover";

/**
* Scrollbar - Make an invisible scrollbar and custom the scrollbar color
*
@@ -55,7 +57,7 @@
border-radius: 20px;
}

@include hover {
@include m-hover.hover {
&::-webkit-scrollbar {
display: block;
}
3 changes: 3 additions & 0 deletions src/scss/02-tools/_m-select-custom.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "f-get-svg-url" as *;
@use "m-rtl" as *;
@use "sass:color";

/**
2 changes: 2 additions & 0 deletions src/scss/02-tools/_m-style-only.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../01-abstract/variables" as *;

/**
* Style for Frontend UI only
*
3 changes: 3 additions & 0 deletions src/scss/02-tools/_m-text-icon.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/constants" as *;
@use "f-get-svg-url" as *;

/**
* Add icon before text with mask to have the same color of the text
*
41 changes: 0 additions & 41 deletions src/scss/02-tools/tools.scss

This file was deleted.

3 changes: 3 additions & 0 deletions src/scss/03-base/_body.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "../01-abstract/variables" as *;
@use "../02-tools/m-rtl" as *;

html {
/* Set automatic RTL direction depending on lang attribute */
@include set-rtl-direction;
2 changes: 1 addition & 1 deletion src/scss/03-base/_fonts.scss
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
* ...
*/

@use "~@fontsource/poppins/scss/mixins" as Poppins;
@use "../../../node_modules/@fontsource/poppins/scss/mixins" as Poppins;

@include Poppins.faces($weights: (300, 400, 500, 700), $styles: normal);
@include Poppins.faces($weights: (300, 400, 500, 700), $styles: italic);
9 changes: 9 additions & 0 deletions src/scss/03-base/_forms.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
@use "../01-abstract/variables" as *;
@use "../02-tools/f-assign-inputs" as *;
@use "../02-tools/f-get-svg-url" as *;
@use "../02-tools/m-checkbox-custom" as *;
@use "../02-tools/m-not-acf" as *;
@use "../02-tools/m-radio-custom" as *;
@use "../02-tools/m-select-custom" as *;
@use "../05-components/btn";

@use "sass:color";

// All inputs variables
Loading