switch from sass to less (css) (#167)

This commit is contained in:
Henri Maurer 2020-08-28 12:59:21 +01:00 committed by GitHub
parent 746b4b1f96
commit 8175e2be62
Failed to generate hash of commit
7 changed files with 104 additions and 575 deletions

3
.gitignore vendored
View file

@ -2,6 +2,7 @@
.DS_Store .DS_Store
.cache .cache
.idea .idea
.vscode
.node_repl_history .node_repl_history
.npm .npm
build/Release build/Release
@ -17,4 +18,4 @@ npm-debug.log*
package-lock.json package-lock.json
repl-temp-* repl-temp-*
result result
src-url src-url

View file

@ -20,22 +20,6 @@ let
echo 9 > $HOME/.node-gyp/${pkgs.nodejs.version}/installVersion echo 9 > $HOME/.node-gyp/${pkgs.nodejs.version}/installVersion
ln -sfv ${pkgs.nodejs}/include $HOME/.node-gyp/${pkgs.nodejs.version} ln -sfv ${pkgs.nodejs}/include $HOME/.node-gyp/${pkgs.nodejs.version}
''; '';
pkgConfig = {
node-sass = {
buildInputs = with pkgs; [
which
python2
libsass
pkgconfig
] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
xcodebuild
];
postInstall = ''
LIBSASS_EXT=auto yarn --offline run build
rm build/config.gypi
'';
};
};
publishBinsFor = publishBinsFor =
[ [
"webpack" "webpack"

View file

@ -28,10 +28,10 @@
"file-loader": "^6.0.0", "file-loader": "^6.0.0",
"google-closure-compiler": "^20200224.0.0", "google-closure-compiler": "^20200224.0.0",
"html-webpack-plugin": "^4.0.2", "html-webpack-plugin": "^4.0.2",
"less": "^3.12.2",
"less-loader": "^7.0.0",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"resolve-url-loader": "^3.1.0", "resolve-url-loader": "^3.1.0",
"sass-loader": "^8.0.0",
"style-loader": "^1.0.0", "style-loader": "^1.0.0",
"url-loader": "^4.0.0", "url-loader": "^4.0.0",
"webpack": "^4.41.2", "webpack": "^4.41.2",
@ -42,4 +42,4 @@
"dependencies": { "dependencies": {
"purecss": "^1.0.1" "purecss": "^1.0.1"
} }
} }

View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
require("./index.scss"); require("./index.less");
const {Elm} = require('./Main'); const {Elm} = require('./Main');
@ -11,4 +11,4 @@ Elm.Main.init({
elasticsearchUsername : process.env.ELASTICSEARCH_USERNAME || 'z3ZFJ6y2mR', elasticsearchUsername : process.env.ELASTICSEARCH_USERNAME || 'z3ZFJ6y2mR',
elasticsearchPassword : process.env.ELASTICSEARCH_PASSWORD || 'ds8CEvALPf9pui7XG' elasticsearchPassword : process.env.ELASTICSEARCH_PASSWORD || 'ds8CEvALPf9pui7XG'
} }
}); });

View file

@ -89,7 +89,6 @@ header .navbar.navbar-static-top {
} }
} }
.loader, .loader,
.loader:before, .loader:before,
.loader:after { .loader:after {
@ -149,4 +148,3 @@ header .navbar.navbar-static-top {
height: 5em; height: 5em;
} }
} }

View file

@ -50,10 +50,10 @@ var common = {
} }
}, },
{ {
test: /\.scss$/, test: /\.less$/,
exclude: [/elm-stuff/, /node_modules/], exclude: [/elm-stuff/, /node_modules/],
// see https://github.com/webpack-contrib/css-loader#url // see https://github.com/webpack-contrib/css-loader#url
loaders: ["style-loader", "css-loader?url=false", "sass-loader"] loaders: ["style-loader", "css-loader?url=false", "less-loader"]
}, },
{ {
test: /\.css$/, test: /\.css$/,
@ -174,12 +174,12 @@ if (MODE === "production") {
] ]
}, },
{ {
test: /\.scss$/, test: /\.less$/,
exclude: [/elm-stuff/, /node_modules/], exclude: [/elm-stuff/, /node_modules/],
loaders: [ loaders: [
MiniCssExtractPlugin.loader, MiniCssExtractPlugin.loader,
"css-loader?url=false", "css-loader?url=false",
"sass-loader" "less-loader"
] ]
} }
] ]

640
yarn.lock

File diff suppressed because it is too large Load diff