Migrate Makefile entries to shell.nix

Isolate the whole nodejs/yarn stuff.
Migrate from node-sass to dart sass in order to do so.
Easier to install, less dependencies (no python, no compiling while yarn
install)
This commit is contained in:
Daniel Siepmann 2022-02-09 20:17:00 +01:00
parent 48a2ca6482
commit a4f1c7c480
6 changed files with 302 additions and 1126 deletions

View file

@ -4,8 +4,8 @@
border-color: $yellow-dark; border-color: $yellow-dark;
color: $black-dark; color: $black-dark;
padding: { padding: {
top: $spacer / 4; top: calc($spacer / 4);
bottom: $spacer / 4; bottom: calc($spacer / 4);
left: $spacer; left: $spacer;
right: $spacer; right: $spacer;
} }

View file

@ -1,9 +1,9 @@
aside { aside {
&[class^='admonition-'] { &[class^='admonition-'] {
border: none; border: none;
border-left: solid $spacer / 4; border-left: solid calc($spacer / 4);
padding: $spacer * 2; padding: calc($spacer * 2);
margin-top: $spacer * 2; margin-top: calc($spacer * 2);
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
padding-top: 0; padding-top: 0;

View file

@ -42,9 +42,9 @@ strong {
blockquote { blockquote {
border: none; border: none;
border-left: dashed $spacer / 4; border-left: dashed calc($spacer / 4);
padding: $spacer; padding: $spacer;
margin-top: $spacer * 2; margin-top: calc($spacer * 2);
border-color: $white; border-color: $white;
&:before { &:before {
@ -69,7 +69,7 @@ ol {
li { li {
padding: { padding: {
bottom: $spacer / 2; bottom: calc($spacer / 2);
top: $spacer / 2; top: calc($spacer / 2);
} }
} }

View file

@ -1,5 +1,5 @@
const { src, dest, parallel, watch } = require('gulp'); const { src, dest, parallel, watch } = require('gulp');
const sass = require('gulp-sass'); const sass = require('gulp-dart-sass');
const minifyCSS = require('gulp-csso'); const minifyCSS = require('gulp-csso');
const frontendSassFolder = 'Resources/Private/Sass/Frontend/'; const frontendSassFolder = 'Resources/Private/Sass/Frontend/';

View file

@ -5,17 +5,15 @@
"watch": "gulp watch" "watch": "gulp watch"
}, },
"engines": { "engines": {
"npm": "6.12.*", "node": "16.*"
"node": "12.*"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-cli": "^2.2.0", "gulp-cli": "^2.2.0",
"gulp-csso": "^3.0.1", "gulp-csso": "^3.0.1",
"gulp-sass": "^4.0.2", "gulp-dart-sass": "^1.0.2",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"popper.js": "^1.16.0", "popper.js": "^1.16.0"
"sass": "^1.23.3"
} }
} }

1400
yarn.lock

File diff suppressed because it is too large Load diff