diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 9d693de..b0e5493 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -15,6 +15,6 @@ jobs: - uses: actions/checkout@v6 - uses: actions/setup-node@v6 with: - node-version: 22.x + node-version: 24.x - run: npm ci - run: npm run build diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3af192a..4257316 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v6 - uses: actions/setup-node@v6 with: - node-version: 22.x + node-version: 24.x - run: npm ci - run: npm run build - uses: actions/upload-artifact@v7 diff --git a/package-lock.json b/package-lock.json index 376209e..20bcce8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1798,9 +1798,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", "dev": true, "license": "MIT", "dependencies": { @@ -4340,9 +4340,9 @@ "license": "MIT" }, "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", "dev": true, "license": "MIT" }, @@ -4995,9 +4995,9 @@ "license": "MIT" }, "node_modules/serialize-javascript": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz", - "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz", + "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==", "dev": true, "license": "BSD-3-Clause", "engines": { diff --git a/src/theme/_tweaks.scss b/src/theme/_tweaks.scss index f9f8d8b..798e3a2 100644 --- a/src/theme/_tweaks.scss +++ b/src/theme/_tweaks.scss @@ -1,4 +1,5 @@ @use "sass:color"; +@use "variables" as *; body { position: relative; diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 4fd97c6..b38d3c0 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -1,12 +1,32 @@ -// Bootstrap variable overrides -@import "variables"; - -// Bootstrap -@import "~bootstrap/scss/bootstrap"; +// Bootstrap with variable overrides +@use "bootstrap/scss/bootstrap" with ( + $primary: #f0ad4e, + $white: #fff, + $gray-100: #f8f9fa, + $gray-200: #e9ecef, + $gray-300: #dee2e6, + $gray-400: #ced4da, + $gray-500: #adb5bd, + $gray-600: #868e96, + $gray-700: #495057, + $gray-800: #343a40, + $gray-900: #212529, + $black: #080602, + $secondary: #868e96, + $body-bg: #080602, + $body-color: #f8f9fa, + $font-family-sans-serif: (Oxygen, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif), + $blockquote-font-size: 1.5rem, + $navbar-dark-color: #f0ad4e, + $navbar-dark-hover-color: #495057, + $navbar-dark-active-color: #f0ad4e, + $navbar-dark-disabled-color: #dee2e6, + $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PScwIDAgMzIgMzInIHhtbG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zyc+PHBhdGggc3Ryb2tlPScjZjBhZDRlJyBzdHJva2Utd2lkdGg9JzInIHN0cm9rZS1saW5lY2FwPSdyb3VuZCcgc3Ryb2tlLW1pdGVybGltaXQ9JzEwJyBkPSdNNCA4aDI0TTQgMTZoMjRNNCAyNGgyNCcvPjwvc3ZnPg=="), +); // Extra tweaks and components -@import "tweaks"; -@import "featured_list"; +@use "tweaks"; +@use "featured_list"; // Fonts -@import "fonts"; +@use "fonts"; diff --git a/webpack-dev.config.js b/webpack-dev.config.js index 461dcef..1d97415 100644 --- a/webpack-dev.config.js +++ b/webpack-dev.config.js @@ -20,7 +20,10 @@ const config = { }, { test: /\.s[ac]ss$/i, - use: ['style-loader', 'css-loader', 'sass-loader'] + use: ['style-loader', 'css-loader', { + loader: 'sass-loader', + options: { sassOptions: { quietDeps: true } } + }] }, { test: /\.(woff|woff2)$/i, diff --git a/webpack-prod.config.js b/webpack-prod.config.js index 913e88a..4f4ada0 100644 --- a/webpack-prod.config.js +++ b/webpack-prod.config.js @@ -20,7 +20,10 @@ const config = { }, { test: /\.s[ac]ss$/i, - use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'] + use: [MiniCssExtractPlugin.loader, 'css-loader', { + loader: 'sass-loader', + options: { sassOptions: { quietDeps: true } } + }] }, { test: /\.(woff|woff2)$/i,