diff --git a/src/components/SiteFooter/Referrals/Link.svelte b/src/components/SiteFooter/Referrals/Link.svelte
index 0653a327..45b60861 100644
--- a/src/components/SiteFooter/Referrals/Link.svelte
+++ b/src/components/SiteFooter/Referrals/Link.svelte
@@ -19,7 +19,7 @@
{/if}
- {title}
+ {title}
diff --git a/src/components/Theme/themes/common.js b/src/components/Theme/themes/common.js
index 6a2ad16f..088df01d 100644
--- a/src/components/Theme/themes/common.js
+++ b/src/components/Theme/themes/common.js
@@ -1,5 +1,6 @@
/** @type {Omit} */
-// Generated from https://www.fluid-type-scale.com/calculate?minFontSize=18&minWidth=320&minRatio=1.125&maxFontSize=22&maxWidth=1280&maxRatio=1.25&steps=xxs%2Cxs%2Csm%2Cbase%2Clg%2Cxl%2C2xl%2C3xl%2C4xl%2C5xl%2C6xl&baseStep=base&prefix=+fs&decimals=2&useRems=on&remValue=16&previewFont=Noto+Sans&previewText=Almost+before+we+knew+it%2C+we+had+left+the+ground&previewWidth=0
+// Generated from https://www.fluid-type-scale.com/calculate?minFontSize=18&minWidth=320&minRatio=1.125&maxFontSize=21&maxWidth=1280&maxRatio=1.25&steps=xxs%2Cxs%2Csm%2Cbase%2Clg%2Cxl%2C2xl%2C3xl%2C4xl%2C5xl%2C6xl&baseStep=base&prefix=&decimals=2&useRems=on&remValue=16&previewFont=Noto+Sans&previewText=Almost+before+we+knew+it%2C+we+had+left+the+ground&previewWidth=0
+
export default {
font: {
family: {
@@ -13,17 +14,17 @@ export default {
note: 'var(--theme-font-family-sans-serif)',
},
size: {
- xxs: 'clamp(0.79rem, -0.14vw + 0.82rem, 0.7rem)',
- xs: 'clamp(0.89rem, -0.01vw + 0.89rem, 0.88rem)',
- sm: 'clamp(1rem, 0.17vw + 0.97rem, 1.1rem)',
- base: 'clamp(1.13rem, 0.42vw + 1.04rem, 1.38rem)',
- lg: 'clamp(1.27rem, 0.76vw + 1.11rem, 1.72rem)',
- xl: 'clamp(1.42rem, 1.21vw + 1.18rem, 2.15rem)',
- '2xl': 'clamp(1.6rem, 1.81vw + 1.24rem, 2.69rem)',
- '3xl': 'clamp(1.8rem, 2.59vw + 1.28rem, 3.36rem)',
- '4xl': 'clamp(2.03rem, 3.61vw + 1.3rem, 4.2rem)',
- '5xl': 'clamp(2.28rem, 4.94vw + 1.29rem, 5.25rem)',
- '6xl': 'clamp(2.57rem, 6.65vw + 1.24rem, 6.56rem)',
+ xxs: 'clamp(0.79rem, -0.2vw + 0.83rem, 0.67rem)',
+ xs: 'clamp(0.89rem, -0.08vw + 0.91rem, 0.84rem)',
+ sm: 'clamp(1rem, 0.08vw + 0.98rem, 1.05rem)',
+ base: 'clamp(1.13rem, 0.31vw + 1.06rem, 1.31rem)',
+ lg: 'clamp(1.27rem, 0.63vw + 1.14rem, 1.64rem)',
+ xl: 'clamp(1.42rem, 1.04vw + 1.21rem, 2.05rem)',
+ '2xl': 'clamp(1.6rem, 1.6vw + 1.28rem, 2.56rem)',
+ '3xl': 'clamp(1.8rem, 2.34vw + 1.33rem, 3.2rem)',
+ '4xl': 'clamp(2.03rem, 3.3vw + 1.37rem, 4.01rem)',
+ '5xl': 'clamp(2.28rem, 4.54vw + 1.37rem, 5.01rem)',
+ '6xl': 'clamp(2.57rem, 6.15vw + 1.33rem, 6.26rem)',
},
},
};
diff --git a/src/scss/reset/_typography.scss b/src/scss/reset/_typography.scss
index 8c800f72..cfe0663c 100644
--- a/src/scss/reset/_typography.scss
+++ b/src/scss/reset/_typography.scss
@@ -25,15 +25,15 @@ body {
// SIZE RANGE REFERENCE //
// xxs: 12.64px
// xs: 14.22px
-// sm: 16.00px → 17.60px
-// base: 18.00px → 22.00px
-// lg: 20.25px → 27.50px
-// xl: 22.78px → 34.38px
-// 2xl: 25.63px → 42.97px
-// 3xl: 28.83px → 53.71px
-// 4xl: 32.44px → 67.14px
-// 5xl: 36.49px → 83.92px
-// 6xl: 41.05px → 104.90px
+// sm: 16.00px → 16.80px
+// base: 18.00px → 21.00px
+// lg: 20.25px → 26.25px
+// xl: 22.78px → 32.81px
+// 2xl: 25.63px → 41.02px
+// 3xl: 28.83px → 51.27px
+// 4xl: 32.44px → 64.09px
+// 5xl: 36.49px → 80.11px
+// 6xl: 41.05px → 100.14px
/////////////
// HEADINGS
diff --git a/src/scss/tokens/sizing/_main.scss b/src/scss/tokens/sizing/_main.scss
index a4355a08..2cd3a678 100644
--- a/src/scss/tokens/sizing/_main.scss
+++ b/src/scss/tokens/sizing/_main.scss
@@ -1,6 +1,6 @@
@forward 'height';
+@forward 'width';
@forward 'max-height';
@forward 'max-width';
@forward 'min-height';
@forward 'min-width';
-@forward 'width';
diff --git a/src/scss/tokens/spacers/mixins/_fluid-margin.scss b/src/scss/tokens/spacers/mixins/_fluid-margin.scss
index ca025ae7..03849626 100644
--- a/src/scss/tokens/spacers/mixins/_fluid-margin.scss
+++ b/src/scss/tokens/spacers/mixins/_fluid-margin.scss
@@ -1,16 +1,16 @@
-// Generated from https://utopia.fyi/space/calculator?c=320,18,1.125,1280,22,1.25,7,3,&s=0.75%7C0.5%7C0.25,1.5%7C2%7C3%7C4%7C6,s-l&g=s,l,xl,12
+// Generated from https://utopia.fyi/space/calculator/?c=320,18,1.125,1280,21,1.25,7,3,&s=0.75|0.5|0.25,1.5|2|3|4|6,s-l&g=s,l,xl,12
@use 'sass:map';
$fluid-margin-levels: (
'0': 0,
- '1': clamp(0.31rem, calc(0.29rem + 0.1vw), 0.38rem),
+ '1': clamp(0.31rem, calc(0.31rem + 0vw), 0.31rem),
'2': clamp(0.56rem, calc(0.52rem + 0.21vw), 0.69rem),
- '3': clamp(0.88rem, calc(0.81rem + 0.31vw), 1.06rem),
- '4': clamp(1.13rem, calc(1.04rem + 0.42vw), 1.38rem),
- '5': clamp(1.69rem, calc(1.56rem + 0.63vw), 2.06rem),
- '6': clamp(2.25rem, calc(2.08rem + 0.83vw), 2.75rem),
- '7': clamp(3.38rem, calc(3.13rem + 1.25vw), 4.13rem),
- '8': clamp(4.5rem, calc(4.17rem + 1.67vw), 5.5rem),
- '9': clamp(6.75rem, calc(6.25rem + 2.5vw), 8.25rem),
+ '3': clamp(0.88rem, calc(0.83rem + 0.21vw), 1rem),
+ '4': clamp(1.13rem, calc(1.06rem + 0.31vw), 1.31rem),
+ '5': clamp(1.69rem, calc(1.58rem + 0.52vw), 2rem),
+ '6': clamp(2.25rem, calc(2.13rem + 0.63vw), 2.63rem),
+ '7': clamp(3.38rem, calc(3.19rem + 0.94vw), 3.94rem),
+ '8': clamp(4.5rem, calc(4.25rem + 1.25vw), 5.25rem),
+ '9': clamp(6.75rem, calc(6.38rem + 1.88vw), 7.88rem),
);
@mixin fm-0 {
diff --git a/src/scss/tokens/spacers/mixins/_fluid-padding.scss b/src/scss/tokens/spacers/mixins/_fluid-padding.scss
index 4356677c..158a3f2e 100644
--- a/src/scss/tokens/spacers/mixins/_fluid-padding.scss
+++ b/src/scss/tokens/spacers/mixins/_fluid-padding.scss
@@ -2,15 +2,15 @@
@use 'sass:map';
$fluid-padding-levels: (
'0': 0,
- '1': clamp(0.31rem, calc(0.29rem + 0.1vw), 0.38rem),
+ '1': clamp(0.31rem, calc(0.31rem + 0vw), 0.31rem),
'2': clamp(0.56rem, calc(0.52rem + 0.21vw), 0.69rem),
- '3': clamp(0.88rem, calc(0.81rem + 0.31vw), 1.06rem),
- '4': clamp(1.13rem, calc(1.04rem + 0.42vw), 1.38rem),
- '5': clamp(1.69rem, calc(1.56rem + 0.63vw), 2.06rem),
- '6': clamp(2.25rem, calc(2.08rem + 0.83vw), 2.75rem),
- '7': clamp(3.38rem, calc(3.13rem + 1.25vw), 4.13rem),
- '8': clamp(4.5rem, calc(4.17rem + 1.67vw), 5.5rem),
- '9': clamp(6.75rem, calc(6.25rem + 2.5vw), 8.25rem),
+ '3': clamp(0.88rem, calc(0.83rem + 0.21vw), 1rem),
+ '4': clamp(1.13rem, calc(1.06rem + 0.31vw), 1.31rem),
+ '5': clamp(1.69rem, calc(1.58rem + 0.52vw), 2rem),
+ '6': clamp(2.25rem, calc(2.13rem + 0.63vw), 2.63rem),
+ '7': clamp(3.38rem, calc(3.19rem + 0.94vw), 3.94rem),
+ '8': clamp(4.5rem, calc(4.25rem + 1.25vw), 5.25rem),
+ '9': clamp(6.75rem, calc(6.38rem + 1.88vw), 7.88rem),
);
@mixin fp-0 {
diff --git a/src/scss/tokens/text/_main.scss b/src/scss/tokens/text/_main.scss
index 7c59ac07..93322fb7 100644
--- a/src/scss/tokens/text/_main.scss
+++ b/src/scss/tokens/text/_main.scss
@@ -1,3 +1,4 @@
+@forward 'text-role';
@forward 'color';
@forward 'font-family';
@forward 'font-size';
@@ -12,4 +13,3 @@
@forward 'vertical-align';
@forward 'white-space';
@forward 'word-break';
-@forward 'text-role';
diff --git a/src/scss/tokens/text/_text-role.scss b/src/scss/tokens/text/_text-role.scss
index e55070d4..7624e455 100644
--- a/src/scss/tokens/text/_text-role.scss
+++ b/src/scss/tokens/text/_text-role.scss
@@ -35,7 +35,3 @@
.drop-cap {
@include drop-cap;
}
-
-.body-correction {
- @include body-correction;
-}
diff --git a/src/scss/tokens/text/mixins/_text-role.scss b/src/scss/tokens/text/mixins/_text-role.scss
index e969be92..222c9a18 100644
--- a/src/scss/tokens/text/mixins/_text-role.scss
+++ b/src/scss/tokens/text/mixins/_text-role.scss
@@ -92,12 +92,6 @@
float: left;
@include fmr-1;
@include font-light;
- font-size: calc(3.44 * var(--theme-font-size-base));
+ font-size: calc(3.33 * var(--theme-font-size-base));
line-height: 0.9;
}
-
-@mixin body-correction {
- @include body-note;
- @include text-secondary;
- font-style: italic;
-}