From 342ea54f640b62592003cdae665996682d406020 Mon Sep 17 00:00:00 2001 From: Jonas Leder Date: Mon, 17 Jan 2022 12:13:55 +0100 Subject: [PATCH 1/3] switch from sass to style as preprocessor --- package.json | 14 +- scss/_colorMixer.scss | 3 - scss/_var.scss | 16 -- scss/style.scss | 20 -- scss/error.scss => styl/error.styl | 2 +- styl/lib/_colorMixer.styl | 3 + .../_comments.scss => styl/lib/_comments.styl | 0 scss/_content.scss => styl/lib/_content.styl | 0 .../lib/_cookieinfo.styl | 0 scss/_footer.scss => styl/lib/_footer.styl | 0 scss/_general.scss => styl/lib/_general.styl | 2 +- scss/_header.scss => styl/lib/_header.styl | 0 scss/_home.scss => styl/lib/_home.styl | 0 scss/_menu.scss => styl/lib/_menu.styl | 0 .../lib/_menuMobile.styl | 0 scss/_mobile.scss => styl/lib/_mobile.styl | 0 .../lib/_mobileSmall.styl | 0 .../lib/_normalize.styl | 0 scss/_ntp.scss => styl/lib/_ntp.styl | 0 scss/_prism.scss => styl/lib/_prism.styl | 0 .../lib/_sellingTable.styl | 0 scss/_skills.scss => styl/lib/_skills.styl | 0 styl/lib/_var.styl | 16 ++ styl/style.styl | 20 ++ yarn.lock | 234 ++++++++++-------- 25 files changed, 177 insertions(+), 153 deletions(-) delete mode 100644 scss/_colorMixer.scss delete mode 100644 scss/_var.scss delete mode 100644 scss/style.scss rename scss/error.scss => styl/error.styl (99%) create mode 100644 styl/lib/_colorMixer.styl rename scss/_comments.scss => styl/lib/_comments.styl (100%) rename scss/_content.scss => styl/lib/_content.styl (100%) rename scss/_cookieinfo.scss => styl/lib/_cookieinfo.styl (100%) rename scss/_footer.scss => styl/lib/_footer.styl (100%) rename scss/_general.scss => styl/lib/_general.styl (96%) rename scss/_header.scss => styl/lib/_header.styl (100%) rename scss/_home.scss => styl/lib/_home.styl (100%) rename scss/_menu.scss => styl/lib/_menu.styl (100%) rename scss/_menuMobile.scss => styl/lib/_menuMobile.styl (100%) rename scss/_mobile.scss => styl/lib/_mobile.styl (100%) rename scss/_mobileSmall.scss => styl/lib/_mobileSmall.styl (100%) rename scss/_normalize.scss => styl/lib/_normalize.styl (100%) rename scss/_ntp.scss => styl/lib/_ntp.styl (100%) rename scss/_prism.scss => styl/lib/_prism.styl (100%) rename scss/_sellingTable.scss => styl/lib/_sellingTable.styl (100%) rename scss/_skills.scss => styl/lib/_skills.styl (100%) create mode 100644 styl/lib/_var.styl create mode 100644 styl/style.styl diff --git a/package.json b/package.json index 62c633c..66d9162 100644 --- a/package.json +++ b/package.json @@ -7,18 +7,18 @@ "license": "GPL-3.0-or-later", "scripts": { "compile": "concurrently \"yarn css\" \"yarn js\"", - "css": "sass scss/:public/css --style=compressed --no-source-map", + "css": "stylus styl/ -o public/css/ ", "js": "webpack --config ./webpack.conf.js", - "watch": "concurrently \"sass --watch --style compressed scss/:public/css\" \"cd public && php -S localhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\"" + "watch": "concurrently \"stylus -w styl/ -o public/css/\" \"cd public && php -S localhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\"" }, "devDependencies": { "concurrently": "^6.0.0", - "webpack-cli": "^4.5.0", - "sass": "^1.32.8", - "webpack": "^5.28.0" + "webpack": "^5.28.0", + "webpack-cli": "^4.5.0" }, "dependencies": { "basiclightbox": "^5.0.4", - "chart.js": "^2.9.4" + "chart.js": "^2.9.4", + "stylus": "^0.56.0" } -} \ No newline at end of file +} diff --git a/scss/_colorMixer.scss b/scss/_colorMixer.scss deleted file mode 100644 index 5abf3b0..0000000 --- a/scss/_colorMixer.scss +++ /dev/null @@ -1,3 +0,0 @@ -$back-color-2: darken($back-color, $darker-color); -$back-color-3: darken($back-color, $darker-color-2); -$accent-color-2: darken($accent-color, $darker-color); \ No newline at end of file diff --git a/scss/_var.scss b/scss/_var.scss deleted file mode 100644 index 3925ddf..0000000 --- a/scss/_var.scss +++ /dev/null @@ -1,16 +0,0 @@ -$back-color: #1a2332; -$text-color: #b3b3b3; -$title-color: #fff; -$accent-color: #20c5ad; -$content-footer-div-color: #03A8F4; - -$darker-color: 5%; -$darker-color-2: 2%; - -$border-radius-sub-nav: 10px; -$border-radius-image: 5px; - -$mobile-max-width: 700px; -$small-mobile-max-width: 300px; - -$link-hover-animation-time: 0.2s; diff --git a/scss/style.scss b/scss/style.scss deleted file mode 100644 index 5d4550c..0000000 --- a/scss/style.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import "var"; -@import "colorMixer"; -@import "general"; -@import "menu"; -@import "normalize"; -@import "ntp"; -@import "header"; -@import "cookieinfo"; -@import "comments"; -@import "footer"; -@import "content"; -@import "mobile"; -@import "menuMobile"; -@import "mobileSmall"; -@import "home"; -@import "prism"; -@import "sellingTable"; -@import "skills"; - -@import "../node_modules/basiclightbox/src/styles/main"; diff --git a/scss/error.scss b/styl/error.styl similarity index 99% rename from scss/error.scss rename to styl/error.styl index b1e1b40..66d63f8 100644 --- a/scss/error.scss +++ b/styl/error.styl @@ -1,4 +1,4 @@ -@import "var"; +@import "lib/_var"; body { background: $back-color; diff --git a/styl/lib/_colorMixer.styl b/styl/lib/_colorMixer.styl new file mode 100644 index 0000000..48f43ef --- /dev/null +++ b/styl/lib/_colorMixer.styl @@ -0,0 +1,3 @@ +$back-color-2 = darken($back-color, $darker-color); +$back-color-3 = darken($back-color, $darker-color-2); +$accent-color-2 = darken($accent-color, $darker-color); \ No newline at end of file diff --git a/scss/_comments.scss b/styl/lib/_comments.styl similarity index 100% rename from scss/_comments.scss rename to styl/lib/_comments.styl diff --git a/scss/_content.scss b/styl/lib/_content.styl similarity index 100% rename from scss/_content.scss rename to styl/lib/_content.styl diff --git a/scss/_cookieinfo.scss b/styl/lib/_cookieinfo.styl similarity index 100% rename from scss/_cookieinfo.scss rename to styl/lib/_cookieinfo.styl diff --git a/scss/_footer.scss b/styl/lib/_footer.styl similarity index 100% rename from scss/_footer.scss rename to styl/lib/_footer.styl diff --git a/scss/_general.scss b/styl/lib/_general.styl similarity index 96% rename from scss/_general.scss rename to styl/lib/_general.styl index aa80918..91dca9a 100644 --- a/scss/_general.scss +++ b/styl/lib/_general.styl @@ -54,7 +54,7 @@ h1 { .red { color: red; a:hover { - color: darken($color: #f00, $amount: 10%) + color: darken(#f00, 10%) } } diff --git a/scss/_header.scss b/styl/lib/_header.styl similarity index 100% rename from scss/_header.scss rename to styl/lib/_header.styl diff --git a/scss/_home.scss b/styl/lib/_home.styl similarity index 100% rename from scss/_home.scss rename to styl/lib/_home.styl diff --git a/scss/_menu.scss b/styl/lib/_menu.styl similarity index 100% rename from scss/_menu.scss rename to styl/lib/_menu.styl diff --git a/scss/_menuMobile.scss b/styl/lib/_menuMobile.styl similarity index 100% rename from scss/_menuMobile.scss rename to styl/lib/_menuMobile.styl diff --git a/scss/_mobile.scss b/styl/lib/_mobile.styl similarity index 100% rename from scss/_mobile.scss rename to styl/lib/_mobile.styl diff --git a/scss/_mobileSmall.scss b/styl/lib/_mobileSmall.styl similarity index 100% rename from scss/_mobileSmall.scss rename to styl/lib/_mobileSmall.styl diff --git a/scss/_normalize.scss b/styl/lib/_normalize.styl similarity index 100% rename from scss/_normalize.scss rename to styl/lib/_normalize.styl diff --git a/scss/_ntp.scss b/styl/lib/_ntp.styl similarity index 100% rename from scss/_ntp.scss rename to styl/lib/_ntp.styl diff --git a/scss/_prism.scss b/styl/lib/_prism.styl similarity index 100% rename from scss/_prism.scss rename to styl/lib/_prism.styl diff --git a/scss/_sellingTable.scss b/styl/lib/_sellingTable.styl similarity index 100% rename from scss/_sellingTable.scss rename to styl/lib/_sellingTable.styl diff --git a/scss/_skills.scss b/styl/lib/_skills.styl similarity index 100% rename from scss/_skills.scss rename to styl/lib/_skills.styl diff --git a/styl/lib/_var.styl b/styl/lib/_var.styl new file mode 100644 index 0000000..8a9164a --- /dev/null +++ b/styl/lib/_var.styl @@ -0,0 +1,16 @@ +$back-color= #1a2332; +$text-color= #b3b3b3; +$title-color= #fff; +$accent-color= #20c5ad; +$content-footer-div-color= #03A8F4; + +$darker-color= 5%; +$darker-color-2= 2%; + +$border-radius-sub-nav= 10px; +$border-radius-image= 5px; + +$mobile-max-width= 700px; +$small-mobile-max-width= 300px; + +$link-hover-animation-time= 0.2s; diff --git a/styl/style.styl b/styl/style.styl new file mode 100644 index 0000000..93d3a88 --- /dev/null +++ b/styl/style.styl @@ -0,0 +1,20 @@ +@import "lib/_var"; +@import "lib/_colorMixer"; +@import "lib/_general"; +@import "lib/_menu"; +@import "lib/_normalize"; +@import "lib/_ntp"; +@import "lib/_header"; +@import "lib/_cookieinfo"; +@import "lib/_comments"; +@import "lib/_footer"; +@import "lib/_content"; +@import "lib/_mobile"; +@import "lib/_menuMobile"; +@import "lib/_mobileSmall"; +@import "lib/_home"; +@import "lib/_prism"; +@import "lib/_sellingTable"; +@import "lib/_skills"; + +@import "../node_modules/basiclightbox/dist/basicLightbox.min.css"; diff --git a/yarn.lock b/yarn.lock index 74ce46c..02dece3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -256,30 +256,28 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -anymatch@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== basiclightbox@^5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/basiclightbox/-/basiclightbox-5.0.4.tgz#5367d6d468ae44406e51b8486cfb8751f36f1fb2" integrity sha512-EsuNWmfcFXWZOe0txKXsllYOC7bDpoaVLc4HHHlYKB/roymlZs+FBdLUU6rx2yPpnJZhulwheKdPjqr2k0+NGQ== -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: - fill-range "^7.0.1" + balanced-match "^1.0.0" + concat-map "0.0.1" browserslist@^4.14.5: version "4.16.3" @@ -342,21 +340,6 @@ chartjs-color@^2.1.0: chartjs-color-string "^0.6.0" color-convert "^1.9.3" -"chokidar@>=2.0.0 <4.0.0": - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -421,6 +404,11 @@ commander@^7.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + concurrently@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.0.0.tgz#c1a876dd99390979c71f8c6fe6796882f3a13199" @@ -445,11 +433,32 @@ cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" +css@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" + integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== + dependencies: + inherits "^2.0.4" + source-map "^0.6.1" + source-map-resolve "^0.6.0" + date-fns@^2.16.1: version "2.19.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.19.0.tgz#65193348635a28d5d916c43ec7ce6fbd145059e1" integrity sha512-X3bf2iTPgCAQp9wvjOQytnf5vO5rESYRXlPIVcgSbtT5OTScPcsf9eZU+B/YIkKAtYr5WeCii58BgATrNitlWg== +debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + electron-to-chromium@^1.3.649: version "1.3.699" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.699.tgz#854eea9db8bc8109c409a4807bfdb200dd75a2c7" @@ -562,13 +571,6 @@ fastest-levenshtein@^1.0.12: resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -577,10 +579,10 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" -fsevents@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= function-bind@^1.1.1: version "1.1.1" @@ -597,18 +599,23 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== -glob-parent@~5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== +glob@^7.1.6: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + graceful-fs@^4.1.2, graceful-fs@^4.2.4: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" @@ -649,6 +656,19 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + interpret@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" @@ -659,13 +679,6 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - is-core-module@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" @@ -673,28 +686,11 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - dependencies: - is-extglob "^2.1.1" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -795,11 +791,23 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + moment@^2.10.2: version "2.29.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -820,11 +828,6 @@ normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -832,6 +835,13 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -880,6 +890,11 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -890,11 +905,6 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== -picomatch@^2.0.4, picomatch@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -924,13 +934,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== - dependencies: - picomatch "^2.2.1" - rechoir@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" @@ -975,12 +978,15 @@ safe-buffer@^5.1.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -sass@^1.32.8: - version "1.32.8" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc" - integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== - dependencies: - chokidar ">=2.0.0 <4.0.0" +safer-buffer@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sax@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== schema-utils@^3.0.0: version "3.0.0" @@ -1032,6 +1038,14 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-resolve@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" + integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + source-map-support@~0.5.19: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -1045,7 +1059,7 @@ source-map@^0.6.0, source-map@^0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.7.2: +source-map@^0.7.3, source-map@~0.7.2: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== @@ -1102,6 +1116,18 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +stylus@^0.56.0: + version "0.56.0" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.56.0.tgz#13fc85c48082db483c90d2530942fe8b0be988eb" + integrity sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA== + dependencies: + css "^3.0.0" + debug "^4.3.2" + glob "^7.1.6" + safer-buffer "^2.1.2" + sax "~1.2.4" + source-map "^0.7.3" + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -1149,13 +1175,6 @@ terser@^5.5.1: source-map "~0.7.2" source-map-support "~0.5.19" -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - tree-kill@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" @@ -1285,6 +1304,11 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + y18n@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" From 3acdcf0c1b090cdd18fc6b48b613c17633c23cdc Mon Sep 17 00:00:00 2001 From: Jonas Leder Date: Mon, 17 Jan 2022 12:30:46 +0100 Subject: [PATCH 2/3] remove percent in darken --- styl/lib/_var.styl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styl/lib/_var.styl b/styl/lib/_var.styl index 8a9164a..820bc09 100644 --- a/styl/lib/_var.styl +++ b/styl/lib/_var.styl @@ -4,8 +4,8 @@ $title-color= #fff; $accent-color= #20c5ad; $content-footer-div-color= #03A8F4; -$darker-color= 5%; -$darker-color-2= 2%; +$darker-color= 5; +$darker-color-2= 2; $border-radius-sub-nav= 10px; $border-radius-image= 5px; From ad4dac013963f6c82ffb9da05f0f43e58b1a9cfc Mon Sep 17 00:00:00 2001 From: Jonas Leder Date: Mon, 17 Jan 2022 12:30:59 +0100 Subject: [PATCH 3/3] remove localhost only in php webserver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66d9162..51d342e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "compile": "concurrently \"yarn css\" \"yarn js\"", "css": "stylus styl/ -o public/css/ ", "js": "webpack --config ./webpack.conf.js", - "watch": "concurrently \"stylus -w styl/ -o public/css/\" \"cd public && php -S localhost:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\"" + "watch": "concurrently \"stylus -w styl/ -o public/css/\" \"cd public && php -S 0.0.0.0:1234\" \"webpack --config ./webpack.conf.js --mode development --watch\"" }, "devDependencies": { "concurrently": "^6.0.0",