diff --git a/eleventy.config.js b/eleventy.config.js index 90ac257..e3cda47 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -1,11 +1,9 @@ import { EleventyRenderPlugin } from "@11ty/eleventy"; import fluidPlugin from "eleventy-plugin-fluid"; -import fluidSassPlugin from "eleventy-plugin-fluid-sass"; import footnotesPlugin from "eleventy-plugin-footnotes"; export default function eleventy(eleventyConfig) { eleventyConfig.addPlugin(EleventyRenderPlugin); - eleventyConfig.addPlugin(fluidSassPlugin); eleventyConfig.addPlugin(footnotesPlugin); eleventyConfig.addPlugin(fluidPlugin); @@ -13,9 +11,8 @@ export default function eleventy(eleventyConfig) { "src/admin/config.yml": "admin/config.yml" }); - eleventyConfig.addPassthroughCopy({ - "src/assets": "assets" - }); + eleventyConfig.addPassthroughCopy({ "src/assets": "assets" }); + eleventyConfig.addPassthroughCopy({ "src/assets/fonts": "assets/fonts" }); return { dir: { diff --git a/package-lock.json b/package-lock.json index 7a06fb6..79589c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,6 @@ "dependencies": { "@11ty/eleventy": "^3.0.0", "eleventy-plugin-fluid": "github:fluid-project/eleventy-plugin-fluid#feat/overhaul-i18n", - "eleventy-plugin-fluid-sass": "^1.0.0", "eleventy-plugin-footnotes": "^0.11.0", "rimraf": "^6.0", "rosetta": "^1.1.0" @@ -1392,75 +1391,6 @@ "node": ">= 8" } }, - "node_modules/@parcel/watcher": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz", - "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "dependencies": { - "detect-libc": "^1.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.0", - "@parcel/watcher-darwin-arm64": "2.5.0", - "@parcel/watcher-darwin-x64": "2.5.0", - "@parcel/watcher-freebsd-x64": "2.5.0", - "@parcel/watcher-linux-arm-glibc": "2.5.0", - "@parcel/watcher-linux-arm-musl": "2.5.0", - "@parcel/watcher-linux-arm64-glibc": "2.5.0", - "@parcel/watcher-linux-arm64-musl": "2.5.0", - "@parcel/watcher-linux-x64-glibc": "2.5.0", - "@parcel/watcher-linux-x64-musl": "2.5.0", - "@parcel/watcher-win32-arm64": "2.5.0", - "@parcel/watcher-win32-ia32": "2.5.0", - "@parcel/watcher-win32-x64": "2.5.0" - } - }, - "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz", - "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher/node_modules/detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", - "license": "Apache-2.0", - "optional": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -2891,18 +2821,6 @@ "infusion": "^4.7.1" } }, - "node_modules/eleventy-plugin-fluid-sass": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eleventy-plugin-fluid-sass/-/eleventy-plugin-fluid-sass-1.0.0.tgz", - "integrity": "sha512-yVxldq7s6MPnNVdv+9XM/PVl5omHPJprX8UmWuhCDuZ+BosT+ZCum3QvaCOBMTHlA9K17APPw60NF55iQjCjxA==", - "license": "BSD-3-Clause", - "dependencies": { - "@11ty/eleventy-utils": "^1.0.3", - "browserslist": "^4.23.3", - "lightningcss": "^1.26.0", - "sass": "^1.77.8" - } - }, "node_modules/eleventy-plugin-footnotes": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/eleventy-plugin-footnotes/-/eleventy-plugin-footnotes-0.11.0.tgz", @@ -3857,12 +3775,6 @@ "node": ">=10 <11 || >=12 <13 || >=14" } }, - "node_modules/immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", - "license": "MIT" - }, "node_modules/import-fresh": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", @@ -5235,13 +5147,6 @@ "tslib": "^2.0.3" } }, - "node_modules/node-addon-api": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "license": "MIT", - "optional": true - }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -6115,54 +6020,6 @@ } ] }, - "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", - "license": "MIT", - "dependencies": { - "chokidar": "^4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=14.0.0" - }, - "optionalDependencies": { - "@parcel/watcher": "^2.4.1" - } - }, - "node_modules/sass/node_modules/chokidar": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", - "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", - "license": "MIT", - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/sass/node_modules/readdirp": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", - "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", - "license": "MIT", - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -6386,15 +6243,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-support": { "version": "0.5.21", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", diff --git a/package.json b/package.json index d2b6587..33d0f82 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "homepage": "https://github.com/inclusive-design/standards.idrc.ocadu.ca#readme", "dependencies": { "@11ty/eleventy": "^3.0.0", - "eleventy-plugin-fluid-sass": "^1.0.0", "eleventy-plugin-fluid": "github:fluid-project/eleventy-plugin-fluid#feat/overhaul-i18n", "eleventy-plugin-footnotes": "^0.11.0", "rimraf": "^6.0", diff --git a/src/assets/styles/abstracts/_variables.css b/src/assets/styles/abstracts/_variables.css new file mode 100644 index 0000000..3e85541 --- /dev/null +++ b/src/assets/styles/abstracts/_variables.css @@ -0,0 +1,20 @@ +:root { + /** Typography **/ + --family-sans-serif: "Source Sans 3", sans-serif; + --font-weight-normal: 400; + --font-weight-medium: 500; + --font-weight-semibold: 600; + --font-weight-bold: 700; + + /** Colours **/ + + --blue: hsla(194, 60%, 59%, 1); + --green: hsla(163, 35%, 49%, 1); + --yellow: hsla(42, 92%, 70%, 1); + --orange: hsla(25, 76%, 64%, 1); + --red: hsla(359, 64%, 63%, 1); + --white: hsla(0, 0%, 100%, 1); + + --indigo-100: hsla(244, 100%, 98%, 1); + --indigo-200: hsla(244, 93%, 93%, 1); +} diff --git a/src/assets/styles/abstracts/_variables.scss b/src/assets/styles/abstracts/_variables.scss deleted file mode 100644 index ade1e8c..0000000 --- a/src/assets/styles/abstracts/_variables.scss +++ /dev/null @@ -1,18 +0,0 @@ -/** Typography **/ -$family-sans-serif: "Source Sans 3", sans-serif; -$font-weight-normal: 400; -$font-weight-medium: 500; -$font-weight-semibold: 600; -$font-weight-bold: 700; - -/** Colours **/ - -$blue: hsla(194, 60%, 59%, 1); -$green: hsla(163, 35%, 49%, 1); -$yellow: hsla(42, 92%, 70%, 1); -$orange: hsla(25, 76%, 64%, 1); -$red: hsla(359, 64%, 63%, 1); -$white: hsla(0, 0%, 100%, 1); - -$indigo-100: hsla(244, 100%, 98%, 1); -$indigo-200: hsla(244, 93%, 93%, 1); diff --git a/src/assets/styles/app.css b/src/assets/styles/app.css new file mode 100644 index 0000000..a818f1b --- /dev/null +++ b/src/assets/styles/app.css @@ -0,0 +1,14 @@ +@charset "UTF-8"; + +/* Abstracts */ + +@import "./abstracts/_variables.css"; + +/* Base */ + +@import "./base/_reset.css"; +@import "./base/_base.css"; + +h1 { + line-height: 1; +} \ No newline at end of file diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss deleted file mode 100644 index 5874850..0000000 --- a/src/assets/styles/app.scss +++ /dev/null @@ -1,11 +0,0 @@ -@charset "UTF-8"; - -// Abstracts - -@import "abstracts/variables"; - -// Base - -@import - "base/reset", - "base/base"; \ No newline at end of file diff --git a/src/assets/styles/base/_base.css b/src/assets/styles/base/_base.css new file mode 100644 index 0000000..eb98353 --- /dev/null +++ b/src/assets/styles/base/_base.css @@ -0,0 +1,5 @@ +@import "./_fonts.css"; + +h1 { + font-family: var(--family-sans-serif); +} \ No newline at end of file diff --git a/src/assets/styles/base/_base.scss b/src/assets/styles/base/_base.scss deleted file mode 100644 index d34fa1f..0000000 --- a/src/assets/styles/base/_base.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import "fonts"; - -h1 { - font-family: $family-sans-serif; -} \ No newline at end of file diff --git a/src/assets/styles/base/_fonts.scss b/src/assets/styles/base/_fonts.css similarity index 61% rename from src/assets/styles/base/_fonts.scss rename to src/assets/styles/base/_fonts.css index 6933020..08474fd 100644 --- a/src/assets/styles/base/_fonts.scss +++ b/src/assets/styles/base/_fonts.css @@ -3,7 +3,7 @@ font-family: 'Raleway'; font-style: normal; font-weight: 400; - src: url('../fonts/raleway-v34-latin-regular.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-regular.woff2') format('woff2'); } @font-face { @@ -11,7 +11,7 @@ font-family: 'Raleway'; font-style: italic; font-weight: 400; - src: url('../fonts/raleway-v34-latin-italic.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-italic.woff2') format('woff2'); } @font-face { @@ -19,7 +19,7 @@ font-family: 'Raleway'; font-style: normal; font-weight: 500; - src: url('../fonts/raleway-v34-latin-500.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-500.woff2') format('woff2'); } @font-face { @@ -27,7 +27,7 @@ font-family: 'Raleway'; font-style: italic; font-weight: 500; - src: url('../fonts/raleway-v34-latin-500italic.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-500italic.woff2') format('woff2'); } @font-face { @@ -35,7 +35,7 @@ font-family: 'Raleway'; font-style: normal; font-weight: 600; - src: url('../fonts/raleway-v34-latin-600.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-600.woff2') format('woff2'); } @font-face { @@ -43,7 +43,7 @@ font-family: 'Raleway'; font-style: italic; font-weight: 600; - src: url('../fonts/raleway-v34-latin-600italic.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-600italic.woff2') format('woff2'); } @font-face { @@ -51,7 +51,7 @@ font-family: 'Raleway'; font-style: normal; font-weight: 700; - src: url('../fonts/raleway-v34-latin-700.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-700.woff2') format('woff2'); } @font-face { @@ -59,7 +59,7 @@ font-family: 'Raleway'; font-style: italic; font-weight: 700; - src: url('../fonts/raleway-v34-latin-700italic.woff2') format('woff2'); + src: url('/assets/fonts/raleway-v34-latin-700italic.woff2') format('woff2'); } @font-face { @@ -67,7 +67,7 @@ font-family: 'Source Sans 3'; font-style: normal; font-weight: 400; - src: url('../fonts/source-sans-3-v15-latin-regular.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-regular.woff2') format('woff2'); } @font-face { @@ -75,7 +75,7 @@ font-family: 'Source Sans 3'; font-style: italic; font-weight: 400; - src: url('../fonts/source-sans-3-v15-latin-italic.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-italic.woff2') format('woff2'); } @font-face { @@ -83,7 +83,7 @@ font-family: 'Source Sans 3'; font-style: normal; font-weight: 500; - src: url('../fonts/source-sans-3-v15-latin-500.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-500.woff2') format('woff2'); } @font-face { @@ -91,7 +91,7 @@ font-family: 'Source Sans 3'; font-style: italic; font-weight: 500; - src: url('../fonts/source-sans-3-v15-latin-500italic.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-500italic.woff2') format('woff2'); } @font-face { @@ -99,7 +99,7 @@ font-family: 'Source Sans 3'; font-style: normal; font-weight: 600; - src: url('../fonts/source-sans-3-v15-latin-600.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-600.woff2') format('woff2'); } @font-face { @@ -107,7 +107,7 @@ font-family: 'Source Sans 3'; font-style: italic; font-weight: 600; - src: url('../fonts/source-sans-3-v15-latin-600italic.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-600italic.woff2') format('woff2'); } @font-face { @@ -115,7 +115,7 @@ font-family: 'Source Sans 3'; font-style: normal; font-weight: 700; - src: url('../fonts/source-sans-3-v15-latin-700.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-700.woff2') format('woff2'); } @font-face { @@ -123,7 +123,7 @@ font-family: 'Source Sans 3'; font-style: italic; font-weight: 700; - src: url('../fonts/source-sans-3-v15-latin-700italic.woff2') format('woff2'); + src: url('/assets/fonts/source-sans-3-v15-latin-700italic.woff2') format('woff2'); } @font-face { @@ -131,7 +131,7 @@ font-family: 'Niramit'; font-style: normal; font-weight: 400; - src: url('../fonts/niramit-v10-latin-regular.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-regular.woff2') format('woff2'); } @font-face { @@ -139,7 +139,7 @@ font-family: 'Niramit'; font-style: italic; font-weight: 400; - src: url('../fonts/niramit-v10-latin-italic.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-italic.woff2') format('woff2'); } @font-face { @@ -147,7 +147,7 @@ font-family: 'Niramit'; font-style: normal; font-weight: 500; - src: url('../fonts/niramit-v10-latin-500.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-500.woff2') format('woff2'); } @font-face { @@ -155,7 +155,7 @@ font-family: 'Niramit'; font-style: italic; font-weight: 500; - src: url('../fonts/niramit-v10-latin-500italic.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-500italic.woff2') format('woff2'); } @font-face { @@ -163,7 +163,7 @@ font-family: 'Niramit'; font-style: normal; font-weight: 600; - src: url('../fonts/niramit-v10-latin-600.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-600.woff2') format('woff2'); } @font-face { @@ -171,7 +171,7 @@ font-family: 'Niramit'; font-style: italic; font-weight: 600; - src: url('../fonts/niramit-v10-latin-600italic.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-600italic.woff2') format('woff2'); } @font-face { @@ -179,7 +179,7 @@ font-family: 'Niramit'; font-style: normal; font-weight: 700; - src: url('../fonts/niramit-v10-latin-700.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-700.woff2') format('woff2'); } @font-face { @@ -187,7 +187,7 @@ font-family: 'Niramit'; font-style: italic; font-weight: 700; - src: url('../fonts/niramit-v10-latin-700italic.woff2') format('woff2'); + src: url('/assets/fonts/niramit-v10-latin-700italic.woff2') format('woff2'); } @font-face { @@ -195,7 +195,7 @@ font-family: 'Merriweather'; font-style: normal; font-weight: 400; - src: url('../fonts/merriweather-v30-latin-regular.woff2') format('woff2'); + src: url('/assets/fonts/merriweather-v30-latin-regular.woff2') format('woff2'); } @font-face { @@ -203,7 +203,7 @@ font-family: 'Merriweather'; font-style: italic; font-weight: 400; - src: url('../fonts/merriweather-v30-latin-italic.woff2') format('woff2'); + src: url('/assets/fonts/merriweather-v30-latin-italic.woff2') format('woff2'); } @font-face { @@ -211,7 +211,7 @@ font-family: 'Merriweather'; font-style: normal; font-weight: 700; - src: url('../fonts/merriweather-v30-latin-700.woff2') format('woff2'); + src: url('/assets/fonts/merriweather-v30-latin-700.woff2') format('woff2'); } @font-face { @@ -219,7 +219,7 @@ font-family: 'Merriweather'; font-style: italic; font-weight: 700; - src: url('../fonts/merriweather-v30-latin-700italic.woff2') format('woff2'); + src: url('/assets/fonts/merriweather-v30-latin-700italic.woff2') format('woff2'); } @font-face { @@ -227,7 +227,7 @@ font-family: Montserrat; font-style: normal; font-weight: 400; - src: url("../fonts/Montserrat-Regular.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-Regular.woff2") format("woff2"); } @font-face { @@ -235,7 +235,7 @@ font-family: Montserrat; font-style: italic; font-weight: 400; - src: url("../fonts/Montserrat-Italic.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-Italic.woff2") format("woff2"); } @font-face { @@ -243,7 +243,7 @@ font-family: Montserrat; font-style: normal; font-weight: 500; - src: url("../fonts/Montserrat-Medium.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-Medium.woff2") format("woff2"); } @font-face { @@ -251,7 +251,7 @@ font-family: Montserrat; font-style: italic; font-weight: 500; - src: url("../fonts/Montserrat-MediumItalic.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-MediumItalic.woff2") format("woff2"); } @font-face { @@ -259,7 +259,7 @@ font-family: Montserrat; font-style: normal; font-weight: 600; - src: url("../fonts/Montserrat-SemiBold.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-SemiBold.woff2") format("woff2"); } @font-face { @@ -267,7 +267,7 @@ font-family: Montserrat; font-style: italic; font-weight: 600; - src: url("../fonts/Montserrat-SemiBoldItalic.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-SemiBoldItalic.woff2") format("woff2"); } @font-face { @@ -275,7 +275,7 @@ font-family: Montserrat; font-style: normal; font-weight: 700; - src: url("../fonts/Montserrat-Bold.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-Bold.woff2") format("woff2"); } @font-face { @@ -283,7 +283,7 @@ font-family: Montserrat; font-style: italic; font-weight: 700; - src: url("../fonts/Montserrat-BoldItalic.woff2") format("woff2"); + src: url("/assets/fonts/Montserrat-BoldItalic.woff2") format("woff2"); } @font-face { @@ -291,7 +291,7 @@ font-family: "Montserrat Alternates"; font-style: normal; font-weight: 400; - src: url("../fonts/MontserratAlternates-Regular.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-Regular.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -300,7 +300,7 @@ font-family: "Montserrat Alternates"; font-style: italic; font-weight: 400; - src: url("../fonts/MontserratAlternates-Italic.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-Italic.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -309,7 +309,7 @@ font-family: "Montserrat Alternates"; font-style: normal; font-weight: 500; - src: url("../fonts/MontserratAlternates-Medium.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-Medium.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -318,7 +318,7 @@ font-family: "Montserrat Alternates"; font-style: italic; font-weight: 500; - src: url("../fonts/MontserratAlternates-MediumItalic.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-MediumItalic.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -327,7 +327,7 @@ font-family: "Montserrat Alternates"; font-style: normal; font-weight: 600; - src: url("../fonts/MontserratAlternates-SemiBold.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-SemiBold.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -336,7 +336,7 @@ font-family: "Montserrat Alternates"; font-style: italic; font-weight: 600; - src: url("../fonts/MontserratAlternates-SemiBoldItalic.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-SemiBoldItalic.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -345,7 +345,7 @@ font-family: "Montserrat Alternates"; font-style: normal; font-weight: 700; - src: url("../fonts/MontserratAlternates-Bold.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-Bold.woff2") format("woff2"); unicode-range: U+0049, U+006C; } @@ -354,6 +354,6 @@ font-family: "Montserrat Alternates"; font-style: italic; font-weight: 700; - src: url("../fonts/MontserratAlternates-BoldItalic.woff2") format("woff2"); + src: url("/assets/fonts/MontserratAlternates-BoldItalic.woff2") format("woff2"); unicode-range: U+0049, U+006C; } diff --git a/src/assets/styles/base/_reset.scss b/src/assets/styles/base/_reset.css similarity index 100% rename from src/assets/styles/base/_reset.scss rename to src/assets/styles/base/_reset.css