From 7ec4a5e454a5cdb140dc16b1ceafbb6a0a086e88 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 11 Oct 2024 16:56:42 +0200 Subject: [PATCH 1/3] Update midnight and typography preset 7. --- styles/08-midnight.json | 62 ++++++++++------------ styles/typography/typography-preset-7.json | 62 ++++++++++------------ 2 files changed, 56 insertions(+), 68 deletions(-) diff --git a/styles/08-midnight.json b/styles/08-midnight.json index 563137d0..5c76928a 100644 --- a/styles/08-midnight.json +++ b/styles/08-midnight.json @@ -62,12 +62,12 @@ { "fluid": false, "name": "Small", - "size": "0.875rem", + "size": "0.9rem", "slug": "small" }, { "fluid": { - "max": "1.1rem", + "max": "1.2rem", "min": "0.9rem" }, "name": "Medium", @@ -76,29 +76,29 @@ }, { "fluid": { - "max": "1.2rem", - "min": "1.09rem" + "max": "1.8rem", + "min": "1.2rem" }, "name": "Large", - "size": "1.38rem", + "size": "1.2rem", "slug": "large" }, { "fluid": { - "max": "2rem", - "min": "1.75rem" + "max": "2.2rem", + "min": "1.8rem" }, "name": "Extra Large", - "size": "1.75rem", + "size": "1.8rem", "slug": "x-large" }, { "fluid": { - "max": "3.625rem", - "min": "2.625rem" + "max": "2.8rem", + "min": "2em" }, "name": "Extra Extra Large", - "size": "2.625rem", + "size": "2rem", "slug": "xx-large" } ] @@ -106,9 +106,10 @@ }, "styles": { "typography": { + "fontSize": "var:preset|font-size|medium", "fontFamily": "var:preset|font-family|fira-sans", - "letterSpacing": "-0.24px", - "lineHeight": "1.4" + "letterSpacing": "-0,01em", + "lineHeight": "1.5" }, "blocks": { "core/avatar": { @@ -146,16 +147,6 @@ "duotone": "var:preset|duotone|midnight-filter" } }, - "core/post-author": { - "typography": { - "fontSize": "var:preset|font-size|small" - } - }, - "core/post-author-name": { - "typography": { - "fontSize": "var:preset|font-size|small" - } - }, "core/post-date": { "color": { "text": "var:preset|color|contrast" @@ -173,12 +164,6 @@ "duotone": "var:preset|duotone|midnight-filter" } }, - "core/post-terms": { - "typography": { - "fontWeight": "400", - "textTransform": "uppercase" - } - }, "core/post-title": { "typography": { "fontWeight": "200" @@ -206,8 +191,7 @@ "typography": { "fontFamily": "var:preset|font-family|literata", "fontWeight": "200", - "letterSpacing": "0em", - "lineHeight": "1.1" + "letterSpacing": "0em" } }, "core/query-pagination": { @@ -218,6 +202,9 @@ }, "core/quote": { "typography": { + "fontSize": "var:preset|font-size|medium", + "letterSpacing": "-0,01em", + "lineHeight": "1.5", "fontWeight": "300" } }, @@ -260,8 +247,9 @@ }, "typography": { "fontFamily": "var:preset|font-family|literata", - "fontWeight": "600", - "letterSpacing": "-0.96px", + "fontSize": "var:preset|font-size|medium", + "fontWeight": "400", + "letterSpacing": "-0.01em", "textTransform": "uppercase" }, ":hover": { @@ -274,7 +262,13 @@ "typography": { "fontFamily": "var:preset|font-family|literata", "fontWeight": "200", - "letterSpacing": "-0.02em" + "letterSpacing": "-0.02em", + "lineHeight": "1.24" + } + }, + "h6": { + "typography": { + "fontWeight": "200" } } }, diff --git a/styles/typography/typography-preset-7.json b/styles/typography/typography-preset-7.json index 656cfc0c..21f13ebd 100644 --- a/styles/typography/typography-preset-7.json +++ b/styles/typography/typography-preset-7.json @@ -9,12 +9,12 @@ { "fluid": false, "name": "Small", - "size": "0.875rem", + "size": "0.9rem", "slug": "small" }, { "fluid": { - "max": "1.1rem", + "max": "1.2rem", "min": "0.9rem" }, "name": "Medium", @@ -23,29 +23,29 @@ }, { "fluid": { - "max": "1.2rem", - "min": "1.09rem" + "max": "1.8rem", + "min": "1.2rem" }, "name": "Large", - "size": "1.38rem", + "size": "1.2rem", "slug": "large" }, { "fluid": { - "max": "2rem", - "min": "1.75rem" + "max": "2.2rem", + "min": "1.8rem" }, "name": "Extra Large", - "size": "1.75rem", + "size": "1.8rem", "slug": "x-large" }, { "fluid": { - "max": "3.625rem", - "min": "2.625rem" + "max": "2.8rem", + "min": "2em" }, "name": "Extra Extra Large", - "size": "2.625rem", + "size": "2rem", "slug": "xx-large" } ] @@ -53,27 +53,12 @@ }, "styles": { "typography": { + "fontSize": "var:preset|font-size|medium", "fontFamily": "var:preset|font-family|fira-sans", - "letterSpacing": "-0.24px", - "lineHeight": "1.4" + "letterSpacing": "-0,01em", + "lineHeight": "1.5" }, "blocks": { - "core/post-author": { - "typography": { - "fontSize": "var:preset|font-size|small" - } - }, - "core/post-author-name": { - "typography": { - "fontSize": "var:preset|font-size|small" - } - }, - "core/post-terms": { - "typography": { - "fontWeight": "400", - "textTransform": "uppercase" - } - }, "core/post-title": { "typography": { "fontWeight": "200" @@ -83,8 +68,7 @@ "typography": { "fontFamily": "var:preset|font-family|literata", "fontWeight": "200", - "letterSpacing": "0em", - "lineHeight": "1.1" + "letterSpacing": "0em" } }, "core/query-pagination": { @@ -95,6 +79,9 @@ }, "core/quote": { "typography": { + "fontSize": "var:preset|font-size|medium", + "letterSpacing": "-0,01em", + "lineHeight": "1.5", "fontWeight": "300" } }, @@ -112,8 +99,9 @@ "button": { "typography": { "fontFamily": "var:preset|font-family|literata", - "fontWeight": "600", - "letterSpacing": "-0.96px", + "fontSize": "var:preset|font-size|medium", + "fontWeight": "400", + "letterSpacing": "-0.01em", "textTransform": "uppercase" } }, @@ -121,7 +109,13 @@ "typography": { "fontFamily": "var:preset|font-family|literata", "fontWeight": "200", - "letterSpacing": "-0.02em" + "letterSpacing": "-0.02em", + "lineHeight": "1.24" + } + }, + "h6": { + "typography": { + "fontWeight": "200" } } } From def980b8858f541e92f5739b4db7853fdd6b434b Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Mon, 14 Oct 2024 10:49:36 +0200 Subject: [PATCH 2/3] Fix wrong values. --- styles/08-midnight.json | 6 +++--- styles/typography/typography-preset-7.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/styles/08-midnight.json b/styles/08-midnight.json index 5c76928a..9409a23a 100644 --- a/styles/08-midnight.json +++ b/styles/08-midnight.json @@ -95,7 +95,7 @@ { "fluid": { "max": "2.8rem", - "min": "2em" + "min": "2rem" }, "name": "Extra Extra Large", "size": "2rem", @@ -108,7 +108,7 @@ "typography": { "fontSize": "var:preset|font-size|medium", "fontFamily": "var:preset|font-family|fira-sans", - "letterSpacing": "-0,01em", + "letterSpacing": "-0.01em", "lineHeight": "1.5" }, "blocks": { @@ -203,7 +203,7 @@ "core/quote": { "typography": { "fontSize": "var:preset|font-size|medium", - "letterSpacing": "-0,01em", + "letterSpacing": "-0.01em", "lineHeight": "1.5", "fontWeight": "300" } diff --git a/styles/typography/typography-preset-7.json b/styles/typography/typography-preset-7.json index 21f13ebd..212df74b 100644 --- a/styles/typography/typography-preset-7.json +++ b/styles/typography/typography-preset-7.json @@ -42,7 +42,7 @@ { "fluid": { "max": "2.8rem", - "min": "2em" + "min": "2rem" }, "name": "Extra Extra Large", "size": "2rem", @@ -55,7 +55,7 @@ "typography": { "fontSize": "var:preset|font-size|medium", "fontFamily": "var:preset|font-family|fira-sans", - "letterSpacing": "-0,01em", + "letterSpacing": "-0.01em", "lineHeight": "1.5" }, "blocks": { @@ -80,7 +80,7 @@ "core/quote": { "typography": { "fontSize": "var:preset|font-size|medium", - "letterSpacing": "-0,01em", + "letterSpacing": "-0.01em", "lineHeight": "1.5", "fontWeight": "300" } From 8dd85f74a9ed9f48bc022023606b8d32c716f1c3 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Mon, 14 Oct 2024 10:54:38 +0200 Subject: [PATCH 3/3] Apply suggestions from code review. --- styles/typography/typography-preset-7.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/styles/typography/typography-preset-7.json b/styles/typography/typography-preset-7.json index 212df74b..73285214 100644 --- a/styles/typography/typography-preset-7.json +++ b/styles/typography/typography-preset-7.json @@ -99,9 +99,7 @@ "button": { "typography": { "fontFamily": "var:preset|font-family|literata", - "fontSize": "var:preset|font-size|medium", "fontWeight": "400", - "letterSpacing": "-0.01em", "textTransform": "uppercase" } },