Merge pull request #103 from joeacarstairs/staging

Update prod

17 files changed, 42 insertions, 55 deletions

diff --git a/scss/custom-properties/_colours.scss b/scss/custom-properties/_colours.scss
index 138a724..c8f31b6 100644
--- a/scss/custom-properties/_colours.scss
+++ b/scss/custom-properties/_colours.scss
@@ -9,7 +9,8 @@
   --special-text-highlight-color: #{colours.$secondary-90};
 }
 
-:root, .dark {
+:root,
+.dark {
   --text-color: #{colours.$primary-98};
   --text-highlight-color: #{colours.$primary-10};
   --background-color: #{colours.$primary-10};
@@ -18,6 +19,7 @@
   --special-text-highlight-color: #{colours.$secondary-10};
 }
 
-:is(main, article) > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) {
-    --background-color: #{colours.$primary-95};
+:is(main, article)
+  > section:nth-child(even):not(:is(section, header) :is(section, header)):not(.dark *) {
+  --background-color: #{colours.$primary-95};
 }
diff --git a/scss/custom-properties/_index.lg.scss b/scss/custom-properties/_index.lg.scss
index 2a36586..ddccb66 100644
--- a/scss/custom-properties/_index.lg.scss
+++ b/scss/custom-properties/_index.lg.scss
@@ -1,3 +1,2 @@
 @use 'spacing/lg' as *;
 @use 'typography/lg' as *;
-
diff --git a/scss/custom-properties/_index.md.scss b/scss/custom-properties/_index.md.scss
index 2367952..722f8cf 100644
--- a/scss/custom-properties/_index.md.scss
+++ b/scss/custom-properties/_index.md.scss
@@ -1,3 +1,2 @@
 @use 'spacing/md' as *;
 @use 'typography/md' as *;
-
diff --git a/scss/custom-properties/_index.sm.scss b/scss/custom-properties/_index.sm.scss
index c1ddffe..d52e81d 100644
--- a/scss/custom-properties/_index.sm.scss
+++ b/scss/custom-properties/_index.sm.scss
@@ -1,3 +1,2 @@
 @use 'spacing/sm' as *;
 @use 'typography/sm' as *;
-
diff --git a/scss/custom-properties/_index.xl.scss b/scss/custom-properties/_index.xl.scss
index 14c55cf..2ef0612 100644
--- a/scss/custom-properties/_index.xl.scss
+++ b/scss/custom-properties/_index.xl.scss
@@ -1,3 +1,2 @@
 @use 'spacing/xl' as *;
 @use 'typography/xl' as *;
-
diff --git a/scss/custom-properties/_index.xs.scss b/scss/custom-properties/_index.xs.scss
index 32eb377..e2af99a 100644
--- a/scss/custom-properties/_index.xs.scss
+++ b/scss/custom-properties/_index.xs.scss
@@ -1,3 +1,2 @@
 @use 'spacing/xs' as *;
 @use 'typography/xs' as *;
-
diff --git a/scss/custom-properties/_index.xxl.scss b/scss/custom-properties/_index.xxl.scss
index 8555eee..1807220 100644
--- a/scss/custom-properties/_index.xxl.scss
+++ b/scss/custom-properties/_index.xxl.scss
@@ -1,3 +1,2 @@
 @use 'spacing/xxl' as *;
 @use 'typography/xxl' as *;
-
diff --git a/scss/custom-properties/spacing/_initial.scss b/scss/custom-properties/spacing/_initial.scss
index a38388f..d52515c 100644
--- a/scss/custom-properties/spacing/_initial.scss
+++ b/scss/custom-properties/spacing/_initial.scss
@@ -8,7 +8,7 @@
   @include mixins.grid();
 
   --width-prose: calc(
-    var(--grid-column-width) * var(--grid-prose-column-count) +
-    var(--grid-gutter-width) * (var(--grid-prose-column-count) - 1)
+    var(--grid-column-width) * var(--grid-prose-column-count) + var(--grid-gutter-width) *
+      (var(--grid-prose-column-count) - 1)
   );
 }
diff --git a/scss/custom-properties/spacing/_mixins.scss b/scss/custom-properties/spacing/_mixins.scss
index 4e35ee7..3008b14 100644
--- a/scss/custom-properties/spacing/_mixins.scss
+++ b/scss/custom-properties/spacing/_mixins.scss
@@ -3,12 +3,36 @@
 @use '../../values/spacing' as spacing-values;
 
 @mixin spacing($breakpoint: initial) {
-  --spacing-inline-lg: #{spacing-values.spacing($direction: inline, $size: lg, $breakpoint: $breakpoint)};
-  --spacing-inline-md: #{spacing-values.spacing($direction: inline, $size: md, $breakpoint: $breakpoint)};
-  --spacing-inline-sm: #{spacing-values.spacing($direction: inline, $size: sm, $breakpoint: $breakpoint)};
-  --spacing-block-lg: #{spacing-values.spacing($direction: block, $size: lg, $breakpoint: $breakpoint)};
-  --spacing-block-md: #{spacing-values.spacing($direction: block, $size: md, $breakpoint: $breakpoint)};
-  --spacing-block-sm: #{spacing-values.spacing($direction: block, $size: sm, $breakpoint: $breakpoint)};
+  --spacing-inline-lg: #{spacing-values.spacing(
+      $direction: inline,
+      $size: lg,
+      $breakpoint: $breakpoint
+    )};
+  --spacing-inline-md: #{spacing-values.spacing(
+      $direction: inline,
+      $size: md,
+      $breakpoint: $breakpoint
+    )};
+  --spacing-inline-sm: #{spacing-values.spacing(
+      $direction: inline,
+      $size: sm,
+      $breakpoint: $breakpoint
+    )};
+  --spacing-block-lg: #{spacing-values.spacing(
+      $direction: block,
+      $size: lg,
+      $breakpoint: $breakpoint
+    )};
+  --spacing-block-md: #{spacing-values.spacing(
+      $direction: block,
+      $size: md,
+      $breakpoint: $breakpoint
+    )};
+  --spacing-block-sm: #{spacing-values.spacing(
+      $direction: block,
+      $size: sm,
+      $breakpoint: $breakpoint
+    )};
 }
 
 @mixin grid($breakpoint: initial) {
diff --git a/scss/custom-properties/typography/_initial.scss b/scss/custom-properties/typography/_initial.scss
index c9d95da..a81fd2a 100644
--- a/scss/custom-properties/typography/_initial.scss
+++ b/scss/custom-properties/typography/_initial.scss
@@ -6,36 +6,10 @@
   @include mixins.font-sizes();
   --border-width: #{typography-values.border-width()};
 
-  --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-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;
+  --font-sans-serif: 'Alegreya Sans', Lato, -apple-system, BlinkMacSystemFont, avenir next, avenir,
+    segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif;
 }
diff --git a/scss/custom-properties/typography/_lg.scss b/scss/custom-properties/typography/_lg.scss
index 30a3019..ff1a645 100644
--- a/scss/custom-properties/typography/_lg.scss
+++ b/scss/custom-properties/typography/_lg.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(lg);
   --border-width: #{typography-values.border-width(lg)};
 }
-
diff --git a/scss/custom-properties/typography/_md.scss b/scss/custom-properties/typography/_md.scss
index df49bdd..5b0752f 100644
--- a/scss/custom-properties/typography/_md.scss
+++ b/scss/custom-properties/typography/_md.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(md);
   --border-width: #{typography-values.border-width(md)};
 }
-
diff --git a/scss/custom-properties/typography/_mixins.scss b/scss/custom-properties/typography/_mixins.scss
index a370356..a23b8f6 100644
--- a/scss/custom-properties/typography/_mixins.scss
+++ b/scss/custom-properties/typography/_mixins.scss
@@ -9,4 +9,3 @@
   --font-size-5: #{typography-values.font-size('5', $breakpoint)};
   --font-size-6: #{typography-values.font-size('6', $breakpoint)};
 }
-
diff --git a/scss/custom-properties/typography/_sm.scss b/scss/custom-properties/typography/_sm.scss
index e1c3585..7f70eb8 100644
--- a/scss/custom-properties/typography/_sm.scss
+++ b/scss/custom-properties/typography/_sm.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(sm);
   --border-width: #{typography-values.border-width(sm)};
 }
-
diff --git a/scss/custom-properties/typography/_xl.scss b/scss/custom-properties/typography/_xl.scss
index 0ddba99..f378dac 100644
--- a/scss/custom-properties/typography/_xl.scss
+++ b/scss/custom-properties/typography/_xl.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(xl);
   --border-width: #{typography-values.border-width(xl)};
 }
-
diff --git a/scss/custom-properties/typography/_xs.scss b/scss/custom-properties/typography/_xs.scss
index 44d8bbb..31ff2f1 100644
--- a/scss/custom-properties/typography/_xs.scss
+++ b/scss/custom-properties/typography/_xs.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(xs);
   --border-width: #{typography-values.border-width(xs)};
 }
-
diff --git a/scss/custom-properties/typography/_xxl.scss b/scss/custom-properties/typography/_xxl.scss
index 1a777dc..59db477 100644
--- a/scss/custom-properties/typography/_xxl.scss
+++ b/scss/custom-properties/typography/_xxl.scss
@@ -6,4 +6,3 @@
   @include mixins.font-sizes(xxl);
   --border-width: #{typography-values.border-width(xxl)};
 }
-