From 850e907b85b83a24210561bce1c8039f5168fc27 Mon Sep 17 00:00:00 2001
From: hobbes7878 <jon.r.mcclure@gmail.com>
Date: Wed, 20 Nov 2024 18:04:45 +0000
Subject: [PATCH] more scss

---
 src/docs/styles/tokens/accessibility/main.mdx |  2 +-
 src/docs/styles/tokens/backgrounds/main.mdx   |  2 +-
 src/docs/styles/tokens/intro.mdx              |  2 +-
 src/docs/styles/tokens/spacers/main.mdx       |  4 ++--
 src/docs/styles/tokens/typography/main.mdx    | 14 +++++++-------
 src/scss/reset/_main.scss                     |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/docs/styles/tokens/accessibility/main.mdx b/src/docs/styles/tokens/accessibility/main.mdx
index 77df2364..74e6bc23 100644
--- a/src/docs/styles/tokens/accessibility/main.mdx
+++ b/src/docs/styles/tokens/accessibility/main.mdx
@@ -13,5 +13,5 @@ import visibilityStyles from '../../../../scss/tokens/accessibility/_visibility.
   title="Visibility"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(visibilityStyles, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
diff --git a/src/docs/styles/tokens/backgrounds/main.mdx b/src/docs/styles/tokens/backgrounds/main.mdx
index 508af425..b679f6fb 100644
--- a/src/docs/styles/tokens/backgrounds/main.mdx
+++ b/src/docs/styles/tokens/backgrounds/main.mdx
@@ -14,5 +14,5 @@ import backgroundColor from '../../../../scss/tokens/backgrounds/_background-col
   mdnLink="background-color"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(backgroundColor, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
diff --git a/src/docs/styles/tokens/intro.mdx b/src/docs/styles/tokens/intro.mdx
index 10c0a801..0095a624 100644
--- a/src/docs/styles/tokens/intro.mdx
+++ b/src/docs/styles/tokens/intro.mdx
@@ -67,7 +67,7 @@ Here's our table of text colour tokens, which set the `text-color` style.
   mdnLink="color"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(color, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 This table's tokens can be used through either a class or an SCSS mixin. (The table lets you click-to-copy for either.)
diff --git a/src/docs/styles/tokens/spacers/main.mdx b/src/docs/styles/tokens/spacers/main.mdx
index f64fa2c9..ddf05b47 100644
--- a/src/docs/styles/tokens/spacers/main.mdx
+++ b/src/docs/styles/tokens/spacers/main.mdx
@@ -44,7 +44,7 @@ As a rule of thumb, if you're setting space between or adjacent to _text element
   mdnLink="margin"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(fluidMargin, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -52,5 +52,5 @@ As a rule of thumb, if you're setting space between or adjacent to _text element
   mdnLink="margin"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(fluidPadding, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
diff --git a/src/docs/styles/tokens/typography/main.mdx b/src/docs/styles/tokens/typography/main.mdx
index c8f5bac0..9b91fad5 100644
--- a/src/docs/styles/tokens/typography/main.mdx
+++ b/src/docs/styles/tokens/typography/main.mdx
@@ -29,7 +29,7 @@ import './styles.scss';
   note="Role tokens group several individual style tokens for common text elements like headers, body text, notes and links. You can use them as a shorthand for our default typography styles."
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(role, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -37,7 +37,7 @@ import './styles.scss';
   mdnLink="color"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(color, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -45,7 +45,7 @@ import './styles.scss';
   mdnLink="font-family"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(fontFamily, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -53,7 +53,7 @@ import './styles.scss';
   mdnLink="font-size"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(fontSize, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -69,7 +69,7 @@ import './styles.scss';
   mdnLink="font-weight"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(fontWeight, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -77,7 +77,7 @@ import './styles.scss';
   mdnLink="letter-spacing"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(letterSpacing, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
@@ -85,7 +85,7 @@ import './styles.scss';
   mdnLink="line-height"
   header={['Class', 'Include', 'Properties']}
   body={cssStringToTableArray(lineHeight, true)}
-  copyable={[true, (t) => `@include ${t};`, false]}
+  copyable={[true, (t) => `@include mixins.${t};`, false]}
 />
 
 <CopyTable
diff --git a/src/scss/reset/_main.scss b/src/scss/reset/_main.scss
index 8bcd9c44..bc29520f 100644
--- a/src/scss/reset/_main.scss
+++ b/src/scss/reset/_main.scss
@@ -1,6 +1,6 @@
 @use '../mixins' as *;
-@import 'normalize';
-@import 'typography';
+@forward 'normalize';
+@forward 'typography';
 
 *,
 *:before,