From 203014c654d3c0e4b3681219c8bf69d38714b726 Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Thu, 8 Sep 2022 12:11:56 -0700 Subject: [PATCH 1/7] Fully implement font size adjustments to variables Partially implementing variables is silly, noticed font sizes weren't implemented fully. Corrected this in my custom, decided it should be in main. Feel free to adjust REM factors to match defaults you like. --- css/main.css | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/css/main.css b/css/main.css index 7ad907637e..71827b6fca 100644 --- a/css/main.css +++ b/css/main.css @@ -7,8 +7,12 @@ --font-primary: "Roboto Condensed"; --font-secondary: "Roboto"; - --font-size: 20px; - --font-size-small: 0.75rem; + --font-size: 20px; + --font-size-xsmall: 0.5rem; + --font-size-small: 0.75rem; + --font-size-medium: 1rem; + --font-size-large: 1.25rem; + --font-size-xlarge: 1.5rem; --gap-body-top: 60px; --gap-body-right: 60px; @@ -60,27 +64,27 @@ body { } .xsmall { - font-size: var(--font-size-small); + font-size: var(--font-size-xsmall); line-height: 1.275; } .small { - font-size: 1rem; + font-size: var(--font-size-small); line-height: 1.25; } .medium { - font-size: 1.5rem; + font-size: var(--font-size-medium); line-height: 1.225; } .large { - font-size: 3.25rem; + font-size: var(--font-size-large); line-height: 1; } .xlarge { - font-size: 3.75rem; + font-size: var(--font-size-xlarge); line-height: 1; letter-spacing: -3px; } From 44854d6a4fb18353f78152dec1ef88c0eb247f6d Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Thu, 8 Sep 2022 12:19:59 -0700 Subject: [PATCH 2/7] Fully implement font size adjustments to variables Partially implementing variables is silly, noticed font sizes weren't implemented fully. Corrected this in my custom, decided it should be in main. Feel free to adjust REM factors to match defaults you like. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5705b51de1..44352b5155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ _This release is scheduled to be released on 2022-10-01._ - Removed DAYAFTERTOMORROW from English - Update dependencies - Updated jsdoc +- Updated font tree to use variables consistantly ## Fixed From 65022f3ce1d3c266279d8ca62c789d5e870e2b35 Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Tue, 13 Sep 2022 12:44:10 -0700 Subject: [PATCH 3/7] reset font sizes not to break --- css/main.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/css/main.css b/css/main.css index 71827b6fca..7959946c73 100644 --- a/css/main.css +++ b/css/main.css @@ -8,11 +8,11 @@ --font-secondary: "Roboto"; --font-size: 20px; - --font-size-xsmall: 0.5rem; - --font-size-small: 0.75rem; - --font-size-medium: 1rem; - --font-size-large: 1.25rem; - --font-size-xlarge: 1.5rem; + --font-size-xsmall: 0.75rem; + --font-size-small: 1rem; + --font-size-medium: 1.5rem; + --font-size-large: 3.25rem; + --font-size-xlarge: 3.75rem; --gap-body-top: 60px; --gap-body-right: 60px; From b8dbf95497a875a6c1fd85a4838b5896258d31d9 Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Tue, 13 Sep 2022 13:58:56 -0700 Subject: [PATCH 4/7] Minor tweak to uncaught error in sizing. --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 7959946c73..18cd01bbba 100644 --- a/css/main.css +++ b/css/main.css @@ -8,7 +8,7 @@ --font-secondary: "Roboto"; --font-size: 20px; - --font-size-xsmall: 0.75rem; + --font-size-xsmall: 1rem; --font-size-small: 1rem; --font-size-medium: 1.5rem; --font-size-large: 3.25rem; From 02201d9f151642a4875de8408d375201f39b59a2 Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Tue, 13 Sep 2022 14:03:06 -0700 Subject: [PATCH 5/7] CSS error in old coding, will break. --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 18cd01bbba..7959946c73 100644 --- a/css/main.css +++ b/css/main.css @@ -8,7 +8,7 @@ --font-secondary: "Roboto"; --font-size: 20px; - --font-size-xsmall: 1rem; + --font-size-xsmall: 0.75rem; --font-size-small: 1rem; --font-size-medium: 1.5rem; --font-size-large: 3.25rem; From b791a3761f54b5a00928bb170cbef9ff88d8b7bc Mon Sep 17 00:00:00 2001 From: "B. Keyport" <44744076+BKeyport@users.noreply.github.com> Date: Fri, 16 Sep 2022 23:56:01 -0700 Subject: [PATCH 6/7] uncaught breaking change - now caught --- css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/main.css b/css/main.css index 7959946c73..e18238297a 100644 --- a/css/main.css +++ b/css/main.css @@ -119,7 +119,7 @@ body { header { text-transform: uppercase; - font-size: var(--font-size-small); + font-size: var(--font-size-xsmall); font-family: var(--font-primary), Arial, Helvetica, sans-serif; font-weight: 400; border-bottom: 1px solid var(--color-text-dimmed); From 29d467715f35f52aa7c21b66390229066fb85dc6 Mon Sep 17 00:00:00 2001 From: Brendan Keyport Date: Sat, 17 Sep 2022 14:47:34 -0700 Subject: [PATCH 7/7] ran prettier --- CHANGELOG.md | 2 +- css/main.css | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44352b5155..8218650931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ _This release is scheduled to be released on 2022-10-01._ - Removed DAYAFTERTOMORROW from English - Update dependencies - Updated jsdoc -- Updated font tree to use variables consistantly +- Updated font tree to use variables consistantly ## Fixed diff --git a/css/main.css b/css/main.css index e18238297a..9206abca45 100644 --- a/css/main.css +++ b/css/main.css @@ -7,12 +7,12 @@ --font-primary: "Roboto Condensed"; --font-secondary: "Roboto"; - --font-size: 20px; - --font-size-xsmall: 0.75rem; - --font-size-small: 1rem; - --font-size-medium: 1.5rem; - --font-size-large: 3.25rem; - --font-size-xlarge: 3.75rem; + --font-size: 20px; + --font-size-xsmall: 0.75rem; + --font-size-small: 1rem; + --font-size-medium: 1.5rem; + --font-size-large: 3.25rem; + --font-size-xlarge: 3.75rem; --gap-body-top: 60px; --gap-body-right: 60px;