Skip to content

Commit

Permalink
Automattic#1491 - Replaced deprecated node-sass with sass, fixed depr…
Browse files Browse the repository at this point in the history
…ecations in _mixins.scss
  • Loading branch information
vjandrea committed Jun 17, 2021
1 parent e8a5863 commit 50b66ee
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
package-lock.json
composer.lock
style.css.map
.DS_Store
.DS_Store
.idea/
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"devDependencies": {
"@wordpress/scripts": "^12.1.0",
"dir-archiver": "^1.1.1",
"node-sass": "^4.14.1",
"rtlcss": "^2.5.0"
"rtlcss": "^2.5.0",
"sass": "^1.35.1"
},
"rtlcssConfig": {
"options": {
Expand All @@ -36,11 +36,11 @@
"map": false
},
"scripts": {
"watch": "node-sass sass/ -o ./ --source-map true --output-style expanded --indent-type tab --indent-width 1 -w",
"compile:css": "node-sass sass/ -o ./ && stylelint '*.css' --fix || true && stylelint '*.css' --fix",
"watch": "sass sass/:./ --source-map --style expanded --indented -w",
"compile:css": "sass sass/:./ && stylelint *.css --fix || true && stylelint *.css --fix",
"compile:rtl": "rtlcss style.css style-rtl.css",
"lint:scss": "wp-scripts lint-style 'sass/**/*.scss'",
"lint:js": "wp-scripts lint-js 'js/*.js'",
"lint:scss": "wp-scripts lint-style sass/**/*.scss",
"lint:js": "wp-scripts lint-js js/*.js",
"bundle": "dir-archiver --src . --dest ../_s.zip --exclude .DS_Store .stylelintrc.json .eslintrc .git .gitattributes .github .gitignore README.md composer.json composer.lock node_modules vendor package-lock.json package.json .travis.yml phpcs.xml.dist sass style.css.map"
}
}
4 changes: 3 additions & 1 deletion sass/abstracts/mixins/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:math";

// Center block
@mixin center-block {
display: block;
Expand All @@ -7,5 +9,5 @@

// Column width with margin
@mixin column-width($numberColumns: 3) {
width: map-get($columns, $numberColumns) - ( ( $columns__margin * ( $numberColumns - 1 ) ) / $numberColumns );
width: map-get($columns, $numberColumns) - math.div(($columns__margin * ($numberColumns - 1)), $numberColumns);
}

0 comments on commit 50b66ee

Please sign in to comment.