From 24bba6dd6c9e3e6d5853df9dba8952057fb1e6b6 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:02:52 +0200 Subject: [PATCH 01/13] Remove font weight of `400` --- styles/06-morning.json | 1 - 1 file changed, 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index 9572b8c0..eefd0931 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -55,7 +55,6 @@ "typography": { "fontFamily": "var:preset|font-family|ysabeau-office", "fontSize": "1.5rem", - "fontWeight": "400", "letterSpacing": "-0.24px", "lineHeight": "1.4" }, From e2bad623140409c33947be829ea7969c560b63ba Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:04:05 +0200 Subject: [PATCH 02/13] Set font-size of pullquote to `xx-large` --- styles/06-morning.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index eefd0931..a0ad70e3 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -144,7 +144,7 @@ "text": "var:preset|color|contrast" }, "typography": { - "fontSize": "var:preset|font-size|x-large" + "fontSize": "var:preset|font-size|xx-large" }, "elements": { "cite": { From fbcffc9f6e1113bc01b877070ac49f65e8bd3ab2 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:07:49 +0200 Subject: [PATCH 03/13] Set font-size to large --- styles/06-morning.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index a0ad70e3..f14b0f1d 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -54,7 +54,7 @@ }, "typography": { "fontFamily": "var:preset|font-family|ysabeau-office", - "fontSize": "1.5rem", + "fontSize": "var:preset|font-size|large", "letterSpacing": "-0.24px", "lineHeight": "1.4" }, From 097ede157cb7dea7b00154be5618dec933f49605 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:08:11 +0200 Subject: [PATCH 04/13] Set button font-size to medium --- styles/06-morning.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index f14b0f1d..d0f6ed81 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -196,7 +196,7 @@ "button": { "typography": { "fontFamily": "var:preset|font-family|literata", - "fontSize": "1.375rem", + "fontSize": "var:preset|font-size|medium", "fontWeight": "900", "letterSpacing": "-0.36px" }, From a28939a8b0f9c5a410c248e5405773b444c115df Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:10:44 +0200 Subject: [PATCH 05/13] Set headings line-height to 1.2 --- styles/06-morning.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index d0f6ed81..092c799b 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -220,7 +220,8 @@ }, "typography": { "fontFamily": "var:preset|font-family|literata", - "fontWeight": "900" + "fontWeight": "900", + "lineHeight": "1.2" } }, "link": { From 8b96dfcd7f34c732aaf224d64aad87221c8ce29a Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:11:08 +0200 Subject: [PATCH 06/13] Reset quote styles. --- styles/06-morning.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index 092c799b..feffab3e 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -159,14 +159,6 @@ } }, "core/quote": { - "color": { - "text": "var:preset|color|contrast" - }, - "typography": { - "fontSize": "1.5rem", - "fontWeight": "500", - "letterSpacing": "-0.18px" - }, "elements": { "cite": { "typography": { From 71278411ee9fab9c0428137e317956c069683cb4 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:12:28 +0200 Subject: [PATCH 07/13] Remove font-weight from post terms. --- styles/06-morning.json | 1 - 1 file changed, 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index feffab3e..16c2412d 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -104,7 +104,6 @@ }, "core/post-terms": { "typography": { - "fontWeight": "400", "fontSize": "var:preset|font-size|medium" }, "color": { From 17999cebc8333cf4ee43aebdc6a629dcd4b42924 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:15:46 +0200 Subject: [PATCH 08/13] Remove text color from quote. --- styles/colors/06-morning.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json index 4c8c0be8..bfd7f329 100644 --- a/styles/colors/06-morning.json +++ b/styles/colors/06-morning.json @@ -114,9 +114,6 @@ } }, "core/quote": { - "color": { - "text": "var:preset|color|contrast" - }, "elements": { "cite": { "color": { From 132972ea4c6c9796413f751130f4ea155995b3e1 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:52:55 +0200 Subject: [PATCH 09/13] Fix h5, h6 --- styles/06-morning.json | 11 +++++++++++ styles/typography/typography-preset-5.json | 14 +++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index 16c2412d..31095cf4 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -215,6 +215,17 @@ "lineHeight": "1.2" } }, + "h5": { + "typography": { + "letterSpacing": "0px" + } + }, + "h6": { + "typography": { + "fontWeight": "900", + "letterSpacing": "0px" + } + }, "link": { "color": { "text": "var:preset|color|contrast" diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index 5eccc543..bec5ed0e 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -111,7 +111,19 @@ "heading": { "typography": { "fontFamily": "var:preset|font-family|literata", - "fontWeight": "900" + "fontWeight": "900", + "lineHeight": "1.2" + } + }, + "h5": { + "typography": { + "letterSpacing": "0px" + } + }, + "h6": { + "typography": { + "fontWeight": "900", + "letterSpacing": "0px" } } }, From 55db68b7a4c280f51f609a964540108971c4c6c9 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:53:11 +0200 Subject: [PATCH 10/13] Modify XXL --- styles/06-morning.json | 46 +++++++++++++++++++ styles/typography/typography-preset-5.json | 51 +++++++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index 31095cf4..2907adfe 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -46,6 +46,52 @@ "slug": "accent-6" } ] + }, + "typography": { + "fontSizes": [ + { + "fluid": false, + "name": "Small", + "size": "0.875rem", + "slug": "small" + }, + { + "fluid": { + "max": "1.125rem", + "min": "1rem" + }, + "name": "Medium", + "size": "1rem", + "slug": "medium" + }, + { + "fluid": { + "max": "1.375rem", + "min": "1.125rem" + }, + "name": "Large", + "size": "1.38rem", + "slug": "large" + }, + { + "fluid": { + "max": "2rem", + "min": "1.75rem" + }, + "name": "Extra Large", + "size": "1.75rem", + "slug": "x-large" + }, + { + "fluid": { + "max": "2.6rem", + "min": "1.4rem" + }, + "name": "Extra Extra Large", + "size": "2.6rem", + "slug": "xx-large" + } + ] } }, "styles": { diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index bec5ed0e..db852eb2 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -3,11 +3,58 @@ "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Literata & Ysabeau Office", "slug": "typography-preset-5", + "settings": { + "typography": { + "fontSizes": [ + { + "fluid": false, + "name": "Small", + "size": "0.875rem", + "slug": "small" + }, + { + "fluid": { + "max": "1.125rem", + "min": "1rem" + }, + "name": "Medium", + "size": "1rem", + "slug": "medium" + }, + { + "fluid": { + "max": "1.375rem", + "min": "1.125rem" + }, + "name": "Large", + "size": "1.38rem", + "slug": "large" + }, + { + "fluid": { + "max": "2rem", + "min": "1.75rem" + }, + "name": "Extra Large", + "size": "1.75rem", + "slug": "x-large" + }, + { + "fluid": { + "max": "2.6rem", + "min": "1.4rem" + }, + "name": "Extra Extra Large", + "size": "2.6rem", + "slug": "xx-large" + } + ] + } + }, "styles": { "typography": { "fontFamily": "var:preset|font-family|ysabeau-office", - "fontSize": "1.5rem", - "fontWeight": "400", + "fontSize": "var:preset|font-size|large", "letterSpacing": "-0.24px", "lineHeight": "1.4" }, From 2bd4875996085fb600d0d0089c8019432103e80e Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:53:30 +0200 Subject: [PATCH 11/13] Add changes to typography preset. --- styles/typography/typography-preset-5.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index db852eb2..bde296d1 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -107,7 +107,7 @@ }, "core/pullquote": { "typography": { - "fontSize": "var:preset|font-size|x-large" + "fontSize": "var:preset|font-size|xx-large" }, "elements": { "cite": { @@ -119,11 +119,6 @@ } }, "core/quote": { - "typography": { - "fontSize": "1.5rem", - "fontWeight": "500", - "letterSpacing": "-0.18px" - }, "elements": { "cite": { "typography": { @@ -150,7 +145,7 @@ "button": { "typography": { "fontFamily": "var:preset|font-family|literata", - "fontSize": "1.375rem", + "fontSize": "var:preset|font-size|medium", "fontWeight": "900", "letterSpacing": "-0.36px" } From 7651d766467393e99aa481a1dfcd096df6815d9a Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 14:53:58 +0200 Subject: [PATCH 12/13] Reset post author and post terms --- styles/06-morning.json | 29 ---------------------- styles/colors/06-morning.json | 15 ----------- styles/typography/typography-preset-5.json | 21 ---------------- 3 files changed, 65 deletions(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index 2907adfe..a7cf4cdf 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -126,35 +126,6 @@ } }, "core/post-author-name": { - "typography": { - "fontSize": "var:preset|font-size|medium" - }, - "color": { - "text": "var:preset|color|contrast" - }, - "elements": { - "link": { - "color": { - "text": "var:preset|color|contrast" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } - } - }, - "core/post-terms": { - "typography": { - "fontSize": "var:preset|font-size|medium" - }, - "color": { - "text": "var:preset|color|contrast" - }, "elements": { "link": { "color": { diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json index bfd7f329..491ce006 100644 --- a/styles/colors/06-morning.json +++ b/styles/colors/06-morning.json @@ -69,21 +69,6 @@ } }, "core/post-author-name": { - "color": { - "text": "var:preset|color|contrast" - }, - "elements": { - "link": { - "color": { - "text": "var:preset|color|contrast" - } - } - } - }, - "core/post-terms": { - "color": { - "text": "var:preset|color|contrast" - }, "elements": { "link": { "color": { diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index bde296d1..9f023b0b 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -65,27 +65,6 @@ } }, "core/post-author-name": { - "typography": { - "fontSize": "var:preset|font-size|medium" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } - } - }, - "core/post-terms": { - "typography": { - "fontWeight": "400", - "fontSize": "var:preset|font-size|medium" - }, "elements": { "link": { "typography": { From f593aff9abcc7af2ae4c02c6a228fd12fecb0a8d Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Mon, 14 Oct 2024 11:11:29 +0200 Subject: [PATCH 13/13] Apply suggestions from code review. --- styles/06-morning.json | 4 +--- styles/typography/typography-preset-5.json | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/styles/06-morning.json b/styles/06-morning.json index a7cf4cdf..4f8ba04c 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -100,9 +100,7 @@ }, "typography": { "fontFamily": "var:preset|font-family|ysabeau-office", - "fontSize": "var:preset|font-size|large", - "letterSpacing": "-0.24px", - "lineHeight": "1.4" + "letterSpacing": "-0.24px" }, "blocks": { "core/code": { diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index 9f023b0b..95c60839 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -54,9 +54,7 @@ "styles": { "typography": { "fontFamily": "var:preset|font-family|ysabeau-office", - "fontSize": "var:preset|font-size|large", - "letterSpacing": "-0.24px", - "lineHeight": "1.4" + "letterSpacing": "-0.24px" }, "blocks": { "core/navigation": {