From 5476627d417fbbdfc835896b014cf9a88f321096 Mon Sep 17 00:00:00 2001 From: "Felix W. Dekker" Date: Sun, 18 Apr 2021 19:09:23 +0200 Subject: [PATCH] Add nav.css for nav-only users --- Gruntfile.js | 1 + package.json | 3 +-- src/main/css/colors.css | 8 ++++++++ src/main/css/common.css | 10 ---------- src/main/css/main.css | 1 + 5 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 src/main/css/colors.css diff --git a/Gruntfile.js b/Gruntfile.js index d1d1c81..9ac2410 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,6 +10,7 @@ module.exports = grunt => { target: { files: { "dist/bundle.css": "src/main/css/main.css", + "dist/nav.css": ["src/main/css/colors.css", "src/main/css/nav.css"], }, }, }, diff --git a/package.json b/package.json index f1b0689..b95b170 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fwdekker/template", - "version": "1.0.4", + "version": "1.1.0", "description": "The base template for pages on fwdekker.com.", "author": "Felix W. Dekker", "license": "MIT", @@ -32,7 +32,6 @@ "grunt-cli": "^1.4.2", "grunt-contrib-clean": "^2.0.0", "grunt-contrib-cssmin": "^4.0.0", - "grunt-contrib-sass": "^2.0.0", "grunt-contrib-watch": "^1.1.0", "grunt-focus": "^1.0.0", "grunt-webpack": "^4.0.2", diff --git a/src/main/css/colors.css b/src/main/css/colors.css new file mode 100644 index 0000000..a3a44c0 --- /dev/null +++ b/src/main/css/colors.css @@ -0,0 +1,8 @@ +/* Variables */ +:root { + --fwdekker-theme-color: #0033cc; + --fwdekker-theme-color-dark: #0029a3; + --fwdekker-theme-color-very-dark: #001f7a; + --fwdekker-theme-color-light: #003df5; + --fwdekker-theme-color-very-light: #1f57ff; +} diff --git a/src/main/css/common.css b/src/main/css/common.css index f1af7cb..9b58734 100644 --- a/src/main/css/common.css +++ b/src/main/css/common.css @@ -1,13 +1,3 @@ -/* Variables */ -:root { - --fwdekker-theme-color: #0033cc; - --fwdekker-theme-color-dark: #0029a3; - --fwdekker-theme-color-very-dark: #001f7a; - --fwdekker-theme-color-light: #003df5; - --fwdekker-theme-color-very-light: #1f57ff; -} - - /* Base elements */ html, body { height: 100%; diff --git a/src/main/css/main.css b/src/main/css/main.css index 33ebb12..e4a676f 100644 --- a/src/main/css/main.css +++ b/src/main/css/main.css @@ -1,5 +1,6 @@ @import "../../../node_modules/normalize.css/normalize.css"; @import "../../../node_modules/milligram/dist/milligram.css"; +@import "colors.css"; @import "common.css"; @import "nav.css"; @import "overrides.css";