From a1cabdeaaf3bade1bd0872bcafc52c81f1c31ce8 Mon Sep 17 00:00:00 2001 From: Joe Carstairs <65492573+Sycamost@users.noreply.github.com> Date: Thu, 19 Oct 2023 23:13:30 +0100 Subject: Optimise CSS (#17) * Installs Sass * installs concurrently * Ports CSS to SCSS * Gitignores CSS build output * Moves public/main.css to scss/index.scss * Fixes port to SCSS * Use-ifies base styles * Use-ifies layout styles * Use-ifies modules styles * Use-ifies variables * Use-ifies utils * Moves normalize to scss * Implements a CSS minifying step with CSSO --------- Co-authored-by: Joe Carstairs --- public/css/variables/colours.css | 23 ----------------- public/css/variables/index.css | 11 -------- public/css/variables/palette.css | 35 ------------------------- public/css/variables/spacing.css | 47 ---------------------------------- public/css/variables/spacing.lg.css | 6 ----- public/css/variables/spacing.md.css | 6 ----- public/css/variables/spacing.sm.css | 4 --- public/css/variables/spacing.xl.css | 10 -------- public/css/variables/spacing.xs.css | 6 ----- public/css/variables/spacing.xxl.css | 6 ----- public/css/variables/typography.css | 42 ------------------------------ public/css/variables/typography.md.css | 9 ------- public/css/variables/typography.xs.css | 9 ------- 13 files changed, 214 deletions(-) delete mode 100644 public/css/variables/colours.css delete mode 100644 public/css/variables/index.css delete mode 100644 public/css/variables/palette.css delete mode 100644 public/css/variables/spacing.css delete mode 100644 public/css/variables/spacing.lg.css delete mode 100644 public/css/variables/spacing.md.css delete mode 100644 public/css/variables/spacing.sm.css delete mode 100644 public/css/variables/spacing.xl.css delete mode 100644 public/css/variables/spacing.xs.css delete mode 100644 public/css/variables/spacing.xxl.css delete mode 100644 public/css/variables/typography.css delete mode 100644 public/css/variables/typography.md.css delete mode 100644 public/css/variables/typography.xs.css (limited to 'public/css/variables') diff --git a/public/css/variables/colours.css b/public/css/variables/colours.css deleted file mode 100644 index 5c34e42..0000000 --- a/public/css/variables/colours.css +++ /dev/null @@ -1,23 +0,0 @@ -@import 'palette.css'; - -:root { - --text-color: var(--color-primary-98); - --text-highlight-color: var(--color-primary-10); - --background-color: var(--color-primary-10); - --background-highlight-color: var(--color-primary-90); - --special-text-color: var(--color-secondary-90); - --special-text-highlight-color: var(--color-secondary-10); -} - -:is(main, article) { - --text-color: var(--color-primary-10); - --text-highlight-color: var(--color-primary-90); - --background-color: var(--color-primary-98); - --background-highlight-color: var(--color-primary-10); - --special-text-color: var(--color-secondary-40); - --special-text-highlight-color: var(--color-secondary-90); -} - -:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)) { - --background-color: var(--color-primary-95); -} \ No newline at end of file diff --git a/public/css/variables/index.css b/public/css/variables/index.css deleted file mode 100644 index 844ddba..0000000 --- a/public/css/variables/index.css +++ /dev/null @@ -1,11 +0,0 @@ -@import 'colours.css'; -@import 'spacing.css'; -@import 'spacing.xs.css' (min-width: 16rem); -@import 'spacing.sm.css' (min-width: 30rem); -@import 'spacing.md.css' (min-width: 48rem); -@import 'spacing.lg.css' (min-width: 64rem); -@import 'spacing.xl.css' (min-width: 96rem); -@import 'spacing.xxl.css' (min-width: 120rem); -@import 'typography.css'; -@import 'typography.xs.css' (min-width: 16rem); -@import 'typography.md.css' (min-width: 48rem); diff --git a/public/css/variables/palette.css b/public/css/variables/palette.css deleted file mode 100644 index f40bb89..0000000 --- a/public/css/variables/palette.css +++ /dev/null @@ -1,35 +0,0 @@ -:root { - --color-primary-0: #000000; - --color-primary-10: #190064; - --color-primary-20: #2d009d; - --color-primary-25: #381aa8; - --color-primary-30: #442bb3; - --color-primary-35: #503abf; - --color-primary-40: #5c48cc; - --color-primary-50: #7663e7; - --color-primary-60: #907eff; - --color-primary-70: #ac9fff; - --color-primary-80: #c8bfff; - --color-primary-90: #e5deff; - --color-primary-95: #f4eeff; - --color-primary-98: #fdf8ff; - --color-primary-99: #fffbff; - --color-primary-100: #ffffff; - - --color-secondary-0: #000000; - --color-secondary-10: #00201e; - --color-secondary-20: #003733; - --color-secondary-25: #00433f; - --color-secondary-30: #00504b; - --color-secondary-35: #005d57; - --color-secondary-40: #006a64; - --color-secondary-50: #00867e; - --color-secondary-60: #00a299; - --color-secondary-70: #26bfb4; - --color-secondary-80: #50dbcf; - --color-secondary-90: #71f7ec; - --color-secondary-95: #b2fff6; - --color-secondary-98: #e4fffb; - --color-secondary-99: #f2fffc; - --color-secondary-100: #ffffff; -} \ No newline at end of file diff --git a/public/css/variables/spacing.css b/public/css/variables/spacing.css deleted file mode 100644 index a4d1d91..0000000 --- a/public/css/variables/spacing.css +++ /dev/null @@ -1,47 +0,0 @@ -:root { - --margin-inline-md: calc(2 * var(--relative-eighth-rem)); - --margin-block-lg: calc(16 * var(--relative-eighth-rem)); - --margin-block-md: calc(10 * var(--relative-eighth-rem)); - --margin-block-sm: calc(5 * var(--relative-eighth-rem)); - - --padding-inline-lg: calc(4 * var(--relative-eighth-rem)); - --padding-inline-md: calc(2 * var(--relative-eighth-rem)); - --padding-inline-sm: calc(1 * var(--relative-eighth-rem)); - --padding-block-lg: calc(12 * var(--relative-eighth-rem)); - --padding-block-md: calc(8 * var(--relative-eighth-rem)); - --padding-block-sm: calc(5 * var(--relative-eighth-rem)); - - --grid-padding: calc(var(--grid-padding-relative-eighth-rem) * var(--relative-eighth-rem)); - --grid-column-width: calc(var(--grid-column-width-relative-eighth-rem) * var(--relative-eighth-rem)); - --grid-gutter-width: calc(var(--grid-gutter-width-relative-eighth-rem) * var(--relative-eighth-rem)); - - --grid-total-relative-eighth-rem-width: calc( - var(--grid-padding-relative-eighth-rem) * 2 + - var(--grid-column-width-relative-eighth-rem) * var(--grid-column-count) + - var(--grid-gutter-width-relative-eighth-rem) * (var(--grid-column-count) - 1) - ); - --relative-eighth-rem: calc( - var(--grid-total-width) / var(--grid-total-relative-eighth-rem-width) - ); - --width-prose: calc( - var(--grid-column-width) * var(--grid-prose-column-count) + - var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1) - ); - - --grid-column-width-relative-eighth-rem: 32; - --grid-gutter-width-relative-eighth-rem: 4; - - /*********************************************************** - * Generally, we will use columns to keep things laid out * - * nicely. However, on screens narrower than xs, this gets * - * pretty much impossible. So for those screens, we use a * - * single-column layout taking up 100vw. In effect, this * - * is just default CSS layout plus a wee bit padding. From * - * xs widewards, we use multiple columns on a fixed width. * - ***********************************************************/ - - --grid-total-width: 100vw; - --grid-padding-relative-eighth-rem: 8; - --grid-column-count: 1; - --grid-prose-column-count: 1; -} diff --git a/public/css/variables/spacing.lg.css b/public/css/variables/spacing.lg.css deleted file mode 100644 index bc18bfd..0000000 --- a/public/css/variables/spacing.lg.css +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 64rem; - --grid-padding-relative-eighth-rem: 20; - --grid-column-count: 12; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/public/css/variables/spacing.md.css b/public/css/variables/spacing.md.css deleted file mode 100644 index 0028e8a..0000000 --- a/public/css/variables/spacing.md.css +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 48rem; - --grid-padding-relative-eighth-rem: 16; - --grid-column-count: 8; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/public/css/variables/spacing.sm.css b/public/css/variables/spacing.sm.css deleted file mode 100644 index 7cdf26f..0000000 --- a/public/css/variables/spacing.sm.css +++ /dev/null @@ -1,4 +0,0 @@ -:root { - --grid-total-width: 30rem; - --grid-padding-relative-eighth-rem: 12; -} diff --git a/public/css/variables/spacing.xl.css b/public/css/variables/spacing.xl.css deleted file mode 100644 index fc8b1f3..0000000 --- a/public/css/variables/spacing.xl.css +++ /dev/null @@ -1,10 +0,0 @@ -:root { - --grid-total-width: 80rem; - --grid-padding-relative-eighth-rem: 26; - --grid-column-count: 12; - --grid-prose-column-count: 8; - --width-prose: calc( - var(--grid-column-width) * min(8, var(--grid-column-count)) + - var(--grid-gutter-width) * min(7, (var(--grid-column-count) - 1)) - ); -} \ No newline at end of file diff --git a/public/css/variables/spacing.xs.css b/public/css/variables/spacing.xs.css deleted file mode 100644 index fb7c01a..0000000 --- a/public/css/variables/spacing.xs.css +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 15rem; - --grid-padding-relative-eighth-rem: 8; - --grid-column-count: 4; - --grid-prose-column-count: 4; -} diff --git a/public/css/variables/spacing.xxl.css b/public/css/variables/spacing.xxl.css deleted file mode 100644 index 17d2f66..0000000 --- a/public/css/variables/spacing.xxl.css +++ /dev/null @@ -1,6 +0,0 @@ -:root { - --grid-total-width: 100rem; - --grid-padding-relative-eighth-rem: 32; - --grid-column-count: 12; - --grid-prose-column-count: 8; -} \ No newline at end of file diff --git a/public/css/variables/typography.css b/public/css/variables/typography.css deleted file mode 100644 index f8515fd..0000000 --- a/public/css/variables/typography.css +++ /dev/null @@ -1,42 +0,0 @@ -:root { - --font-size-0: calc(8 * var(--relative-eighth-rem)); - --font-size-1: calc(8 * var(--relative-eighth-rem)); - --font-size-2: calc(8 * var(--relative-eighth-rem)); - --font-size-3: calc(8 * var(--relative-eighth-rem)); - --font-size-4: calc(8 * var(--relative-eighth-rem)); - --font-size-5: calc(8 * var(--relative-eighth-rem)); - --font-size-6: calc(8 * var(--relative-eighth-rem)); - - --font-serif: - Alegreya, - -apple-system-ui-serif, - Iowan Old Style, - Apple Garamond, - Baskerville, - Sitka, "Sitka Display", "Sitka Heading", "Sitka Text", - Times New Roman, - Droid Serif, - Times, - Source Serif Pro, - serif, - Apple Color Emoji, - Segoe UI Emoji, - Segoe UI Symbol; - - --font-sans-serif: - 'Alegreya Sans', - Lato, - -apple-system, - BlinkMacSystemFont, - avenir next, - avenir, - segoe ui, - helvetica neue, - helvetica, - Cantarell, - Ubuntu, - roboto, - noto, - arial, - sans-serif -} \ No newline at end of file diff --git a/public/css/variables/typography.md.css b/public/css/variables/typography.md.css deleted file mode 100644 index 2c36d1d..0000000 --- a/public/css/variables/typography.md.css +++ /dev/null @@ -1,9 +0,0 @@ -:root { - --font-size-0: calc(7 * var(--relative-eighth-rem)); - --font-size-1: calc(9 * var(--relative-eighth-rem)); - --font-size-2: calc(12 * var(--relative-eighth-rem)); - --font-size-3: calc(16 * var(--relative-eighth-rem)); - --font-size-4: calc(20 * var(--relative-eighth-rem)); - --font-size-5: calc(26 * var(--relative-eighth-rem)); - --font-size-6: calc(32 * var(--relative-eighth-rem)); -} \ No newline at end of file diff --git a/public/css/variables/typography.xs.css b/public/css/variables/typography.xs.css deleted file mode 100644 index 6375aad..0000000 --- a/public/css/variables/typography.xs.css +++ /dev/null @@ -1,9 +0,0 @@ -:root { - --font-size-0: calc(6 * var(--relative-eighth-rem)); - --font-size-1: calc(8 * var(--relative-eighth-rem)); - --font-size-2: calc(11 * var(--relative-eighth-rem)); - --font-size-3: calc(14 * var(--relative-eighth-rem)); - --font-size-4: calc(18 * var(--relative-eighth-rem)); - --font-size-5: calc(23 * var(--relative-eighth-rem)); - --font-size-6: calc(28 * var(--relative-eighth-rem)); -} \ No newline at end of file -- cgit v1.2.3