From 4e1bea7d94b9980a0d6c0bf5f28ae8871d12a39a Mon Sep 17 00:00:00 2001 From: lindsaym-fa Date: Mon, 15 Jan 2024 09:18:34 -0600 Subject: [PATCH] update fonts, remove font imports from themes --- docs/_includes/default.njk | 2 +- docs/pages/experimental/themer.md | 6 ++++++ src/themes/chic.css | 11 +++++------ src/themes/glassy.css | 1 - src/themes/mellow.css | 3 +-- src/themes/playful.css | 1 - 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/_includes/default.njk b/docs/_includes/default.njk index 9055d0c55..b9db3c213 100644 --- a/docs/_includes/default.njk +++ b/docs/_includes/default.njk @@ -51,7 +51,7 @@ {# Web Fonts #} - + {# Turbo + Scroll positioning #} diff --git a/docs/pages/experimental/themer.md b/docs/pages/experimental/themer.md index fb9389237..8da09024e 100644 --- a/docs/pages/experimental/themer.md +++ b/docs/pages/experimental/themer.md @@ -691,6 +691,9 @@ toc: false case 'lora': fontFamily = `'Lora', serif`; break; + case 'mulish': + fontFamily = `'Mulish', sans-serif`; + break; case 'noto-sans': fontFamily = `'Noto Sans', sans-serif`; break; @@ -746,6 +749,9 @@ toc: false case 'lora': fontFamily = `'Lora', serif`; break; + case 'mulish': + fontFamily = `'Mulish', sans-serif`; + break; case 'noto-sans': fontFamily = `'Noto Sans', sans-serif`; break; diff --git a/src/themes/chic.css b/src/themes/chic.css index a895d58bc..25d97ee27 100644 --- a/src/themes/chic.css +++ b/src/themes/chic.css @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300..600&display=swap'); @import 'depth_3_punchy.css'; /* depth_0_flat.css, depth_1_semiflat.css, depth_2_chunky.css, depth_3_punchy.css, depth_4_glossy.css */ @import 'borders_2_light.css'; /* borders_0_minimal.css, borders_1_feather.css, borders_2_light.css, borders_3_medium.css, borders_4_heavy.css */ @@ -190,12 +189,12 @@ --wa-font-weight-light: 300; --wa-font-weight-normal: 400; - --wa-font-weight-medium: 500; - --wa-font-weight-heavy: 600; + --wa-font-weight-medium: 550; + --wa-font-weight-heavy: 650; - --wa-font-weight-heading: var(--wa-font-weight-medium); + --wa-font-weight-heading: var(--wa-font-weight-heavy); --wa-font-weight-body: var(--wa-font-weight-normal); - --wa-font-weight-action: var(--wa-font-weight-heavy); + --wa-font-weight-action: var(--wa-font-weight-medium); /* The default typescale is based on the Major Second scale (x1.125). * Every other step on the scale is skipped for larger sizes in order to maximize variation. */ @@ -243,7 +242,7 @@ */ /* Corners are designed to scale according to a single base value. * The base value is intended for calculations and is not used by components directly. */ - --wa-corners-base: 0.5; + --wa-corners-base: 0.75; --wa-corners-xs: calc(var(--wa-corners-base) * 0.75rem); --wa-corners-s: calc(var(--wa-corners-base) * 1rem); --wa-corners-m: calc(var(--wa-corners-base) * 2rem); diff --git a/src/themes/glassy.css b/src/themes/glassy.css index ce30576f5..d782f4a15 100644 --- a/src/themes/glassy.css +++ b/src/themes/glassy.css @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300..700&family=Quicksand:wght@300..700&display=swap'); @import 'depth_4_glossy.css'; @import 'borders_0_minimal.css'; diff --git a/src/themes/mellow.css b/src/themes/mellow.css index 984b344c4..d608f0a31 100644 --- a/src/themes/mellow.css +++ b/src/themes/mellow.css @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300..700&family=Lora:wght@400..700&display=swap'); @import 'depth_0_flat.css'; @import 'borders_1_feather.css'; @@ -184,7 +183,7 @@ * Typography */ --wa-font-family-heading: 'Lora', serif; - --wa-font-family-body: 'Inter', serif; + --wa-font-family-body: 'Mulish', sans-serif; --wa-font-family-code: 'Noto Sans Mono', 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace; --wa-font-family-longform: 'Lora', serif; diff --git a/src/themes/playful.css b/src/themes/playful.css index 5bf0f412b..5c27d5e4f 100644 --- a/src/themes/playful.css +++ b/src/themes/playful.css @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Roboto+Flex:wght@300..700&family=Roboto+Slab:wght@300..700&display=swap'); @import 'depth_2_chunky.css'; @import 'borders_4_heavy.css';