From 164649a193380c6fdefe7f19f25be9d04c46c261 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 12:56:23 +0200 Subject: [PATCH 1/6] fix links --- styles/blocks/post-terms-1.json | 8 +++++++- theme.json | 31 +++++-------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/styles/blocks/post-terms-1.json b/styles/blocks/post-terms-1.json index e160cdd1..77430dcd 100644 --- a/styles/blocks/post-terms-1.json +++ b/styles/blocks/post-terms-1.json @@ -23,7 +23,13 @@ }, "typography": { "fontWeight": "400", - "lineHeight": "2.8" + "lineHeight": "2.8", + "textDecoration": "none" + }, + ":hover": { + "typography": { + "textDecoration": "underline" + } } } } diff --git a/theme.json b/theme.json index 6c3b61dd..c6f111c7 100644 --- a/theme.json +++ b/theme.json @@ -1120,20 +1120,6 @@ "fontSize": "var:preset|font-size|medium" } }, - "core/post-author-name": { - "elements": { - "link": { - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } - } - } - } - }, "core/post-date": { "color":{ "text": "var:preset|color|accent-4" @@ -1167,18 +1153,6 @@ "typography": { "fontSize": "var:preset|font-size|small", "fontWeight": "600" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } - } - } } }, "core/post-title": { @@ -1450,6 +1424,11 @@ "link": { "color": { "text": "currentColor" + }, + ":hover": { + "typography": { + "textDecoration": "none" + } } } } From 681d9de7a188bc02dc2486db6c0a24d0c4bf4b1e Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 15:44:31 +0200 Subject: [PATCH 2/6] remove underline from template --- patterns/template-single-left-aligned-content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/template-single-left-aligned-content.php b/patterns/template-single-left-aligned-content.php index 057aacb1..9f86084f 100644 --- a/patterns/template-single-left-aligned-content.php +++ b/patterns/template-single-left-aligned-content.php @@ -30,7 +30,7 @@

- + From 29b16fe4b75236ed5c7df07b1f0ddf9780d84930 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 15:46:39 +0200 Subject: [PATCH 3/6] Update hidden-written-by.php --- patterns/hidden-written-by.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patterns/hidden-written-by.php b/patterns/hidden-written-by.php index 31daa480..949a1f67 100644 --- a/patterns/hidden-written-by.php +++ b/patterns/hidden-written-by.php @@ -15,10 +15,10 @@

- +

- + From c5ac9538ed95be15622e143027bca9854c68ff4d Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 15:52:21 +0200 Subject: [PATCH 4/6] remove unnecessary link styles --- styles/03-dusk.json | 15 --------------- styles/07-sunrise.json | 8 -------- styles/typography/typography-preset-2.json | 12 ------------ styles/typography/typography-preset-6.json | 12 ------------ 4 files changed, 47 deletions(-) diff --git a/styles/03-dusk.json b/styles/03-dusk.json index a81a37d7..8c4741ff 100644 --- a/styles/03-dusk.json +++ b/styles/03-dusk.json @@ -105,21 +105,6 @@ }, "color": { "text": "var:preset|color|accent-2" - }, - "elements": { - "link": { - "color": { - "text": "var:preset|color|accent-2" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } } }, "core/post-title": { diff --git a/styles/07-sunrise.json b/styles/07-sunrise.json index 19a74bf6..45c59f92 100644 --- a/styles/07-sunrise.json +++ b/styles/07-sunrise.json @@ -104,14 +104,6 @@ "link": { "color": { "text": "var:preset|color|contrast" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } } } } diff --git a/styles/typography/typography-preset-2.json b/styles/typography/typography-preset-2.json index 6fa706c0..43d5f00e 100644 --- a/styles/typography/typography-preset-2.json +++ b/styles/typography/typography-preset-2.json @@ -31,18 +31,6 @@ "core/post-terms": { "typography": { "fontWeight": "300" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } } }, "core/post-title": { diff --git a/styles/typography/typography-preset-6.json b/styles/typography/typography-preset-6.json index 78cbc74a..4bd4a9f2 100644 --- a/styles/typography/typography-preset-6.json +++ b/styles/typography/typography-preset-6.json @@ -36,18 +36,6 @@ "core/post-terms": { "typography": { "fontWeight": "400" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } } }, "core/post-title": { From 4708202c1ed5accac820a5285fe97729541cc69d Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 16:00:55 +0200 Subject: [PATCH 5/6] remove more duplicate link styles --- styles/03-dusk.json | 23 ++++++------------ styles/06-morning.json | 16 ------------- styles/07-sunrise.json | 16 ------------- styles/typography/typography-preset-2.json | 28 ---------------------- styles/typography/typography-preset-5.json | 26 -------------------- styles/typography/typography-preset-6.json | 24 ------------------- 6 files changed, 7 insertions(+), 126 deletions(-) diff --git a/styles/03-dusk.json b/styles/03-dusk.json index 8c4741ff..50637951 100644 --- a/styles/03-dusk.json +++ b/styles/03-dusk.json @@ -87,14 +87,6 @@ "link": { "color": { "text": "var:preset|color|accent-2" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } } } } @@ -105,6 +97,13 @@ }, "color": { "text": "var:preset|color|accent-2" + }, + "elements": { + "link": { + "color": { + "text": "var:preset|color|accent-2" + } + } } }, "core/post-title": { @@ -244,14 +243,6 @@ "radius": "4px", "width": "0.8px", "style": "solid" - }, - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } } } } diff --git a/styles/06-morning.json b/styles/06-morning.json index 62e0c23c..94511b31 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -128,14 +128,6 @@ "link": { "color": { "text": "var:preset|color|contrast" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } } } } @@ -260,14 +252,6 @@ "border": { "radius": "100px", "color": "var:preset|color|accent-5" - }, - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } } } } diff --git a/styles/07-sunrise.json b/styles/07-sunrise.json index 45c59f92..59320d08 100644 --- a/styles/07-sunrise.json +++ b/styles/07-sunrise.json @@ -81,14 +81,6 @@ "link": { "color": { "text": "var:preset|color|contrast" - }, - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } } } } @@ -228,14 +220,6 @@ "border": { "radius": "100px", "color": "var:preset|color|accent-5" - }, - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } } } } diff --git a/styles/typography/typography-preset-2.json b/styles/typography/typography-preset-2.json index 43d5f00e..570913b6 100644 --- a/styles/typography/typography-preset-2.json +++ b/styles/typography/typography-preset-2.json @@ -14,18 +14,6 @@ "core/post-author-name": { "typography": { "fontWeight": "300" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } } }, "core/post-terms": { @@ -113,22 +101,6 @@ "letterSpacing": "-0.48px" } } - }, - "variations": { - "post-terms-1": { - "elements": { - "link": { - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } - } - } - } - } } } } diff --git a/styles/typography/typography-preset-5.json b/styles/typography/typography-preset-5.json index 95c60839..b931994c 100644 --- a/styles/typography/typography-preset-5.json +++ b/styles/typography/typography-preset-5.json @@ -62,20 +62,6 @@ "fontSize": "1.25rem" } }, - "core/post-author-name": { - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } - } - }, "core/post-title": { "typography": { "fontWeight": "900", @@ -150,18 +136,6 @@ "post-terms-1": { "typography": { "fontSize": "var:preset|font-size|medium" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } - } - } } } } diff --git a/styles/typography/typography-preset-6.json b/styles/typography/typography-preset-6.json index 4bd4a9f2..64f6fa2c 100644 --- a/styles/typography/typography-preset-6.json +++ b/styles/typography/typography-preset-6.json @@ -19,18 +19,6 @@ "core/post-author-name": { "typography": { "fontSize": "var:preset|font-size|medium" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "underline" - }, - ":hover": { - "typography": { - "textDecoration": "none" - } - } - } } }, "core/post-terms": { @@ -108,18 +96,6 @@ "post-terms-1": { "typography": { "fontSize": "16px" - }, - "elements": { - "link": { - "typography": { - "textDecoration": "none" - }, - ":hover": { - "typography": { - "textDecoration": "underline" - } - } - } } } } From 5132675a69aebd78d8a2ffe37a3b9714ab3f49ec Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Tue, 22 Oct 2024 17:14:09 +0200 Subject: [PATCH 6/6] Fix merge conflict and remove post author name typography like https://github.com/WordPress/twentytwentyfive/commit/34b98a26f89e89e7bf60849ee0eff82cbd330e9b --- styles/typography/typography-preset-6.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/styles/typography/typography-preset-6.json b/styles/typography/typography-preset-6.json index 64f6fa2c..ab49e827 100644 --- a/styles/typography/typography-preset-6.json +++ b/styles/typography/typography-preset-6.json @@ -16,11 +16,6 @@ "fontSize": "1.25rem" } }, - "core/post-author-name": { - "typography": { - "fontSize": "var:preset|font-size|medium" - } - }, "core/post-terms": { "typography": { "fontWeight": "400"