From 23e364f61b9c2ca09baa4699a2e76f9e4634a0de Mon Sep 17 00:00:00 2001 From: Ruthenic Date: Fri, 2 Sep 2022 18:38:54 -0400 Subject: [PATCH] plan on using scss eventually --- package.json | 3 +- pnpm-lock.yaml | 72 +++++++++++++++++++++++++++++-- src/css/{base.css => base.scss} | 2 +- src/css/{color.css => color.scss} | 0 src/css/{font.css => font.scss} | 0 src/layout/Base.astro | 6 +-- src/layout/BaseBlog.astro | 6 +-- src/layout/BaseHeaderless.astro | 6 +-- 8 files changed, 80 insertions(+), 15 deletions(-) rename src/css/{base.css => base.scss} (93%) rename src/css/{color.css => color.scss} (100%) rename src/css/{font.css => font.scss} (100%) diff --git a/package.json b/package.json index 7d5a842..d9ac85c 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,10 @@ "preview": "astro preview" }, "devDependencies": { + "@astrojs/rss": "^0.2.0", "@astrojs/sitemap": "^1.0.0", "astro": "^1.0.0-beta.31", "astro-robots-txt": "^0.3.7", - "@astrojs/rss": "^0.2.0" + "sass": "^1.54.8" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7ad499..fef25e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,12 +5,14 @@ specifiers: '@astrojs/sitemap': ^1.0.0 astro: ^1.0.0-beta.31 astro-robots-txt: ^0.3.7 + sass: ^1.54.8 devDependencies: '@astrojs/rss': 0.2.2 '@astrojs/sitemap': 1.0.0 - astro: 1.0.2 + astro: 1.0.2_sass@1.54.8 astro-robots-txt: 0.3.7 + sass: 1.54.8 packages: @@ -607,6 +609,14 @@ packages: engines: {node: '>=12'} dev: true + /anymatch/3.1.2: + resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==} + engines: {node: '>= 8'} + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + dev: true + /arg/5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} dev: true @@ -636,7 +646,7 @@ packages: zod: 3.18.0 dev: true - /astro/1.0.2: + /astro/1.0.2_sass@1.54.8: resolution: {integrity: sha512-7Bmw8wGQnh/rRpybc6owYbAyr6SXKm7kX56gg82ABJbqnTQhbgOPtg8+k+KKkJekMU/gPe3LfMIh0+Ie+F9xUw==} engines: {node: ^14.18.0 || >=16.12.0, npm: '>=6.14.0'} hasBin: true @@ -693,7 +703,7 @@ packages: tsconfig-resolver: 3.0.1 unist-util-visit: 4.1.0 vfile: 5.3.4 - vite: 3.0.5 + vite: 3.0.5_sass@1.54.8 yargs-parser: 21.1.1 zod: 3.18.0 transitivePeerDependencies: @@ -713,6 +723,11 @@ packages: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} dev: true + /binary-extensions/2.2.0: + resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} + engines: {node: '>=8'} + dev: true + /bl/5.0.0: resolution: {integrity: sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==} dependencies: @@ -811,6 +826,21 @@ packages: resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==} dev: true + /chokidar/3.5.3: + resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.2 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /ci-info/3.3.2: resolution: {integrity: sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==} dev: true @@ -1496,6 +1526,10 @@ packages: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: true + /immutable/4.1.0: + resolution: {integrity: sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==} + dev: true + /inherits/2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} dev: true @@ -1515,6 +1549,13 @@ packages: is-decimal: 2.0.1 dev: true + /is-binary-path/2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + dependencies: + binary-extensions: 2.2.0 + dev: true + /is-buffer/2.0.5: resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} engines: {node: '>=4'} @@ -2233,6 +2274,11 @@ packages: resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==} dev: true + /normalize-path/3.0.0: + resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} + engines: {node: '>=0.10.0'} + dev: true + /npm-run-path/5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -2441,6 +2487,13 @@ packages: util-deprecate: 1.0.2 dev: true + /readdirp/3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + dependencies: + picomatch: 2.3.1 + dev: true + /recast/0.20.5: resolution: {integrity: sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==} engines: {node: '>= 4'} @@ -2610,6 +2663,16 @@ packages: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: true + /sass/1.54.8: + resolution: {integrity: sha512-ib4JhLRRgbg6QVy6bsv5uJxnJMTS2soVcCp9Y88Extyy13A8vV0G1fAwujOzmNkFQbR3LvedudAMbtuNRPbQww==} + engines: {node: '>=12.0.0'} + hasBin: true + dependencies: + chokidar: 3.5.3 + immutable: 4.1.0 + source-map-js: 1.0.2 + dev: true + /sax/1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} dev: true @@ -3021,7 +3084,7 @@ packages: vfile-message: 3.1.2 dev: true - /vite/3.0.5: + /vite/3.0.5_sass@1.54.8: resolution: {integrity: sha512-bRvrt9Tw8EGW4jj64aYFTnVg134E8hgDxyl/eEHnxiGqYk7/pTPss6CWlurqPOUzqvEoZkZ58Ws+Iu8MB87iMA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -3044,6 +3107,7 @@ packages: postcss: 8.4.16 resolve: 1.22.1 rollup: 2.77.3 + sass: 1.54.8 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/src/css/base.css b/src/css/base.scss similarity index 93% rename from src/css/base.css rename to src/css/base.scss index 6e2d149..7ee1b29 100644 --- a/src/css/base.css +++ b/src/css/base.scss @@ -1,5 +1,5 @@ a + a { - margin-left: 5px; + margin-left: 5px; } /*i will kill you if this breaks other parts of the site*/ .footer { diff --git a/src/css/color.css b/src/css/color.scss similarity index 100% rename from src/css/color.css rename to src/css/color.scss diff --git a/src/css/font.css b/src/css/font.scss similarity index 100% rename from src/css/font.css rename to src/css/font.scss diff --git a/src/layout/Base.astro b/src/layout/Base.astro index 97f6cbf..4547211 100644 --- a/src/layout/Base.astro +++ b/src/layout/Base.astro @@ -1,7 +1,7 @@ --- -import '../css/base.css' -import '../css/font.css' -import '../css/color.css' +import '../css/base.scss' +import '../css/font.scss' +import '../css/color.scss' const {title} = Astro.props; --- diff --git a/src/layout/BaseBlog.astro b/src/layout/BaseBlog.astro index 34db142..c492876 100644 --- a/src/layout/BaseBlog.astro +++ b/src/layout/BaseBlog.astro @@ -1,7 +1,7 @@ --- -import '../css/base.css' -import '../css/font.css' -import '../css/color.css' +import '../css/base.scss' +import '../css/font.scss' +import '../css/color.scss' const {content} = Astro.props; const canonicalURL = new URL(Astro.url.pathname, Astro.site); --- diff --git a/src/layout/BaseHeaderless.astro b/src/layout/BaseHeaderless.astro index 75163e8..ec9ae0c 100644 --- a/src/layout/BaseHeaderless.astro +++ b/src/layout/BaseHeaderless.astro @@ -1,7 +1,7 @@ --- -import '../css/base.css' -import '../css/font.css' -import '../css/color.css' +import '../css/base.scss' +import '../css/font.scss' +import '../css/color.scss' const {title} = Astro.props; ---