From ae50137a45645259315a27f5d409a062e9069a04 Mon Sep 17 00:00:00 2001 From: Bauke Date: Thu, 13 Aug 2020 16:19:43 +0200 Subject: [PATCH] Switch to SCSS, fix CSS custom properties. --- package.json | 9 +- source/css/libraries.css | 43 ------- source/css/userscripts.css | 28 ----- source/css/userstyles.css | 28 ----- source/index.html | 18 +-- source/index.js | 3 +- source/libraries/index.html | 113 +++++++++--------- .../variables.css => scss/_variables.scss} | 0 source/{css/index.css => scss/common.scss} | 66 +++++----- source/scss/index.scss | 5 + source/scss/libraries.scss | 44 +++++++ source/scss/userscripts.scss | 19 +++ source/scss/userstyles.scss | 19 +++ source/userscripts/index.html | 17 ++- source/userstyles/index.html | 17 ++- yarn.lock | 40 ++++++- 16 files changed, 255 insertions(+), 214 deletions(-) delete mode 100644 source/css/libraries.css delete mode 100644 source/css/userscripts.css delete mode 100644 source/css/userstyles.css rename source/{css/variables.css => scss/_variables.scss} (100%) rename source/{css/index.css => scss/common.scss} (57%) create mode 100644 source/scss/index.scss create mode 100644 source/scss/libraries.scss create mode 100644 source/scss/userscripts.scss create mode 100644 source/scss/userstyles.scss diff --git a/package.json b/package.json index 75256a3..88b77a2 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "repository": "https://git.holllo.cc/Bauke/bauke.xyz", "license": "MIT", "scripts": { - "start": "nodemon --watch 'source/' --exec 'yarn build' --ext 'html css'", - "build": "node 'source/index.js'", - "test": "xo && stylelint 'source/css/*.css'", + "start": "nodemon --watch 'source/' --exec 'yarn build' --ext 'html scss'", + "build": "node 'source/index.js' && sass 'source/scss/':'public/css/'", + "test": "xo && stylelint 'source/scss/*.scss'", "deploy": "rm -rf 'public/' && yarn build && yarn deploy:netlify", "deploy:netlify": "netlify deploy --prod --dir 'public/' -s 37bb1f7c-2abb-419f-9a31-a4b72209c1c8" }, @@ -24,12 +24,15 @@ "netlify-cli": "^2.58.0", "nodemon": "^2.0.4", "nunjucks": "^3.2.2", + "sass": "^1.26.10", "stylelint": "^13.6.1", + "stylelint-config-xo-scss": "^0.13.0", "stylelint-config-xo-space": "^0.14.0", "xo": "^0.32.1" }, "stylelint": { "extends": [ + "stylelint-config-xo-scss", "stylelint-config-xo-space" ], "rules": { diff --git a/source/css/libraries.css b/source/css/libraries.css deleted file mode 100644 index 8ca54a3..0000000 --- a/source/css/libraries.css +++ /dev/null @@ -1,43 +0,0 @@ -.libraries { - background-color: transparent; - border: none; - padding: 0; -} - -.libraries li { - background-color: var(--background-2); - padding: 16px; -} - -.libraries a { - margin-bottom: 8px; -} - -.libraries a:hover { - background-color: var(--primary-accent-2); -} - -.libraries .badges { - display: flex; - gap: 8px; -} - -#npm, -.libraries li.npm { - border: 1px solid var(--primary-accent-1); -} - -.npm a { - background-color: var(--primary-accent-1); - color: var(--background-1); -} - -#crates, -.libraries li.crates { - border: 1px solid var(--primary-accent-4); -} - -.crates a { - background-color: var(--primary-accent-4); - color: var(--background-1); -} diff --git a/source/css/userscripts.css b/source/css/userscripts.css deleted file mode 100644 index 3e0bc0e..0000000 --- a/source/css/userscripts.css +++ /dev/null @@ -1,28 +0,0 @@ -header { - align-items: center; - background-color: var(--background-2); - border: 1px solid var(--primary-accent-4); - display: flex; - justify-content: center; - padding: 16px; - width: 100%; -} - -h2 { - margin-right: auto; - padding: 0; -} - -a.install { - background-color: var(--primary-accent-4); - color: var(--background-1); -} - -a.install:hover { - background-color: var(--primary-accent-3); -} - -.remove-padding, -.remove-a-padding a { - padding: 0; -} diff --git a/source/css/userstyles.css b/source/css/userstyles.css deleted file mode 100644 index f3dba9e..0000000 --- a/source/css/userstyles.css +++ /dev/null @@ -1,28 +0,0 @@ -header { - align-items: center; - background-color: var(--background-2); - border: 1px solid var(--primary-accent-1); - display: flex; - justify-content: center; - padding: 16px; - width: 100%; -} - -h2 { - margin-right: auto; - padding: 0; -} - -a.install { - background-color: var(--primary-accent-1); - color: var(--background-1); -} - -a.install:hover { - background-color: #96c839; -} - -.remove-padding, -.remove-a-padding a { - padding: 0; -} diff --git a/source/index.html b/source/index.html index 32c20c4..a7480b0 100644 --- a/source/index.html +++ b/source/index.html @@ -6,14 +6,14 @@ Bauke - + -
-

Bauke

-