Skip to content

refactor: replace node-sass by sass #1373

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Nov 21, 2021
Merged

refactor: replace node-sass by sass #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca72dcf
refactor: replaced node-sass by sass and removed node-sass-selector-i…
mfranzke Nov 13, 2021
4561243
refactor(scss): replaced by new Dart Sass syntax
mfranzke Nov 13, 2021
68289fa
refactor: simplified those calculations
mfranzke Nov 13, 2021
f16b459
Revert "refactor: replaced node-sass by sass and removed node-sass-se…
mfranzke Nov 13, 2021
005db94
refactor: replaced node-sass by sass and removed node-sass-selector-i…
mfranzke Nov 13, 2021
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
2 changes: 1 addition & 1 deletion packages/starterkit-handlebars-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"access": "public"
},
"scripts": {
"build": "cd dist/css && npx node-sass style.scss style.css"
"build": "cd dist/css && sass style.scss style.css"
}
}
6 changes: 3 additions & 3 deletions packages/starterkit-twig-demo/dist/css/scss/generic/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ $space : 1em;
$space-and-half : $space*1.5;
$space-double : $space*2;
$space-quad : $space*4;
$space-half : $space/2;
$space-half : $space*0.5;
$pad : 1em;
$pad-and-half : $pad*1.5;
$pad-double : $pad*2;
$pad-half : $pad/2;
$pad-quarter :$pad/4;
$pad-half : $pad*0.5;
$pad-quarter :$pad*0.25;

//Borders
$border-med: 3px;
Expand Down
3 changes: 1 addition & 2 deletions packages/uikit-workshop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@
"lit-html": "^1.1.2",
"mini-css-extract-plugin": "^0.8.0",
"mousetrap": "^1.6.5",
"node-sass": "^6.0.0",
"node-sass-selector-importer": "^5.2.0",
"postcss-loader": "^3.0.0",
"preact": "8.3.1",
"preact-compat": "3.18.4",
Expand All @@ -94,6 +92,7 @@
"react-html-parser": "^2.0.2",
"redux": "3.7.2",
"redux-thunk": "^2.3.0",
"sass": "1.43.4",
"sass-loader": "^10.1.1",
"scriptjs": "^2.5.9",
"scroll-js": "^2.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $pl-font-size-large: 1.2rem;
$pl-space: 1rem;
$pl-doublespace: $pl-space * 2;
$pl-pad: 1rem;
$pl-pad-half: $pl-pad/2;
$pl-pad-half: $pl-pad * 0.5;
$offset-top: 2rem;

// Breakpoints
Expand All @@ -57,4 +57,4 @@ $pl-border-radius: 3px;
$pl-border-radius-med: 6px;


$pl-sidebar-width: 16rem; //Define sidebar width for calculating dimensions
$pl-sidebar-width: 16rem; //Define sidebar width for calculating dimensions
4 changes: 2 additions & 2 deletions packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ pl-nav {
.pl-c-nav__link--sublink {
text-transform: none;
font-size: 0.78rem;
padding-left: $pl-space + ($pl-space / 2);
padding-right: $pl-space + ($pl-space / 2);
padding-left: $pl-space + $pl-space * 0.5;
padding-right: $pl-space + $pl-space * 0.5;

&.pl-is-active {
box-shadow: inset 4px 0 0 #6c79d9;
Expand Down
4 changes: 1 addition & 3 deletions packages/uikit-workshop/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const TerserPlugin = require('terser-webpack-plugin');
const autoprefixer = require('autoprefixer');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const selectorImporter = require('node-sass-selector-importer');
const webpack = require('webpack');
const CopyPlugin = require('copy-webpack-plugin');
const path = require('path');
Expand Down Expand Up @@ -121,8 +120,7 @@ module.exports = function (apiConfig) {
options: {
sassOptions: {
sourceMap: config.sourceMaps,
outputStyle: 'expanded',
importer: [selectorImporter()],
outputStyle: 'expanded'
},
},
},
Expand Down
Loading