From 2522f2b502fa75d42ebed49096bbec8c7904e583 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 16:29:28 +0200 Subject: [PATCH 01/14] remove duplicate overriding json --- styles/01-evening.json | 23 ------------------- styles/colors/01-evening.json | 42 ----------------------------------- 2 files changed, 65 deletions(-) diff --git a/styles/01-evening.json b/styles/01-evening.json index 95e6b8b3..872a4f15 100644 --- a/styles/01-evening.json +++ b/styles/01-evening.json @@ -123,15 +123,6 @@ } } }, - "section-3": { - "elements": { - "link": { - "color": { - "text": "var:preset|color|contrast" - } - } - } - }, "section-4": { "elements": { "button": { @@ -144,20 +135,6 @@ "background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)" } } - }, - "link": { - "color": { - "text": "var:preset|color|accent-2" - } - } - } - }, - "section-5": { - "elements": { - "link": { - "color": { - "text": "var:preset|color|base" - } } } } diff --git a/styles/colors/01-evening.json b/styles/colors/01-evening.json index 92a00f52..02acc8ba 100644 --- a/styles/colors/01-evening.json +++ b/styles/colors/01-evening.json @@ -52,20 +52,6 @@ "color": { "text": "var:preset|color|accent-4" }, - "blocks": { - "core/site-tagline": { - "color": { - "text": "var:preset|color|accent-4" - }, - "elements": { - "link": { - "color": { - "text": "var:preset|color|accent-4" - } - } - } - } - }, "elements": { "button": { "color": { @@ -78,11 +64,6 @@ "text": "var:preset|color|base" } } - }, - "link": { - "color": { - "text": "var:preset|color|accent-4" - } } }, "variations": { @@ -101,15 +82,6 @@ } } }, - "section-3": { - "elements": { - "link": { - "color": { - "text": "var:preset|color|contrast" - } - } - } - }, "section-4": { "elements": { "button": { @@ -122,20 +94,6 @@ "background": "color-mix(in srgb, var(--wp--preset--color--accent-2) 85%, transparent)" } } - }, - "link": { - "color": { - "text": "var:preset|color|accent-2" - } - } - } - }, - "section-5": { - "elements": { - "link": { - "color": { - "text": "var:preset|color|base" - } } } } From 47cbc57f4c6d4ddb97323ce1f10fb738ff72b11a Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 16:29:37 +0200 Subject: [PATCH 02/14] noon --- styles/02-noon.json | 17 ++-------------- styles/colors/02-noon.json | 40 ++++++-------------------------------- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/styles/02-noon.json b/styles/02-noon.json index 9c5e9b12..9c2e15dc 100644 --- a/styles/02-noon.json +++ b/styles/02-noon.json @@ -147,9 +147,6 @@ "right": "1.6rem", "top": "0.6rem" } - }, - "border": { - "color": "currentColor" } } } @@ -287,14 +284,9 @@ } } }, - "heading": { - "color": { - "text": "var:preset|color|accent-2" - } - }, "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -311,14 +303,9 @@ } } }, - "heading": { - "color": { - "text": "var:preset|color|base" - } - }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/colors/02-noon.json b/styles/colors/02-noon.json index 818634c8..fecda91c 100644 --- a/styles/colors/02-noon.json +++ b/styles/colors/02-noon.json @@ -55,25 +55,7 @@ "blocks": { "core/button": { "border": { - "bottom": { - "color": "var:preset|color|contrast" - }, - "left": { - "color": "var:preset|color|contrast" - }, - "right": { - "color": "var:preset|color|contrast" - }, - "top": { - "color": "var:preset|color|contrast" - } - }, - "variations": { - "outline": { - "border": { - "color": "currentColor" - } - } + "color": "var:preset|color|contrast" } }, "core/post-title": { @@ -83,7 +65,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -95,7 +77,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -107,7 +89,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -144,14 +126,9 @@ } } }, - "heading": { - "color": { - "text": "var:preset|color|accent-2" - } - }, "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -168,14 +145,9 @@ } } }, - "heading": { - "color": { - "text": "var:preset|color|base" - } - }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } From 1847dd2f0861022aa329786de6206a9883df6ca2 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 16:56:43 +0200 Subject: [PATCH 03/14] use current color instead of fixed colors --- styles/03-dusk.json | 12 ++++++------ styles/colors/03-dusk.json | 16 ++++++++-------- styles/colors/05-twilight.json | 2 +- styles/colors/06-morning.json | 10 +++++----- styles/colors/07-sunrise.json | 12 ++++++------ styles/colors/08-midnight.json | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/styles/03-dusk.json b/styles/03-dusk.json index a81a37d7..7a7a1a1e 100644 --- a/styles/03-dusk.json +++ b/styles/03-dusk.json @@ -271,7 +271,7 @@ } } }, - "section-1":{ + "section-1": { "elements": { "link": { "color": { @@ -298,12 +298,12 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } @@ -315,7 +315,7 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -337,12 +337,12 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/colors/03-dusk.json b/styles/colors/03-dusk.json index 568ccf66..7bbc6335 100644 --- a/styles/colors/03-dusk.json +++ b/styles/colors/03-dusk.json @@ -77,7 +77,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -89,7 +89,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -169,7 +169,7 @@ } } }, - "section-1":{ + "section-1": { "elements": { "link": { "color": { @@ -196,12 +196,12 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } @@ -213,7 +213,7 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -235,12 +235,12 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/colors/05-twilight.json b/styles/colors/05-twilight.json index 710b86c4..e54b834d 100644 --- a/styles/colors/05-twilight.json +++ b/styles/colors/05-twilight.json @@ -68,7 +68,7 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json index 491ce006..42ae7c13 100644 --- a/styles/colors/06-morning.json +++ b/styles/colors/06-morning.json @@ -123,12 +123,12 @@ }, "heading": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } } }, @@ -182,7 +182,7 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -198,7 +198,7 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } @@ -223,7 +223,7 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/colors/07-sunrise.json b/styles/colors/07-sunrise.json index 7e6b4edf..51263b3c 100644 --- a/styles/colors/07-sunrise.json +++ b/styles/colors/07-sunrise.json @@ -168,7 +168,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-5" + "text": "currentColor" } }, "button": { @@ -191,7 +191,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -214,7 +214,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -237,7 +237,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -261,12 +261,12 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } }, "button": { diff --git a/styles/colors/08-midnight.json b/styles/colors/08-midnight.json index efac06c7..190e1e39 100644 --- a/styles/colors/08-midnight.json +++ b/styles/colors/08-midnight.json @@ -101,7 +101,7 @@ }, "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -124,7 +124,7 @@ }, "link": { "color": { - "text": "var:preset|color|accent-5" + "text": "currentColor" } } } From c983dcf38a28640d9c2facb1c3c3dda5552ee60f Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 16:56:59 +0200 Subject: [PATCH 04/14] apply current color to variations post author and terms --- styles/sections/section-1.json | 24 ++++++++++++++++++++++++ styles/sections/section-2.json | 24 ++++++++++++++++++++++++ styles/sections/section-3.json | 24 ++++++++++++++++++++++++ styles/sections/section-4.json | 24 ++++++++++++++++++++++++ styles/sections/section-5.json | 24 ++++++++++++++++++++++++ 5 files changed, 120 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index c83f817f..397b3a9a 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -18,6 +18,30 @@ "color": { "text": "color-mix(in srgb, currentColor 25%, transparent)" } + }, + "core/post-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/post-terms": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index 3a5f94ff..4ec9df34 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -18,6 +18,30 @@ "color": { "text": "color-mix(in srgb, currentColor 25%, transparent)" } + }, + "core/post-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/post-terms": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 290bea2a..bb362910 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -18,6 +18,30 @@ "color": { "text": "color-mix(in srgb, currentColor 25%, transparent)" } + }, + "core/post-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/post-terms": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 21a63458..5158350b 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -18,6 +18,30 @@ "color": { "text": "color-mix(in srgb, currentColor 25%, transparent)" } + }, + "core/post-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/post-terms": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } }, "elements": { diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index 9a563f62..87f7e430 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -18,6 +18,30 @@ "color": { "text": "color-mix(in srgb, currentColor 25%, transparent)" } + }, + "core/post-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/post-terms": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } }, "elements": { From c566bf83458278ee1c45cd52b2ce63f9418ec547 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 17:01:05 +0200 Subject: [PATCH 05/14] more --- styles/05-twilight.json | 2 +- styles/06-morning.json | 8 ++++---- styles/07-sunrise.json | 12 ++++++------ styles/08-midnight.json | 4 ++-- styles/colors/06-morning.json | 3 ++- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/styles/05-twilight.json b/styles/05-twilight.json index afe01761..a1d78ff9 100644 --- a/styles/05-twilight.json +++ b/styles/05-twilight.json @@ -202,7 +202,7 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/06-morning.json b/styles/06-morning.json index 62e0c23c..429f3441 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -309,7 +309,7 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -321,12 +321,12 @@ "color": { "background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)", "text": "var:preset|color|contrast" - } } + } }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } @@ -351,7 +351,7 @@ }, "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } } } diff --git a/styles/07-sunrise.json b/styles/07-sunrise.json index afff8ce0..e872fe02 100644 --- a/styles/07-sunrise.json +++ b/styles/07-sunrise.json @@ -253,7 +253,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-5" + "text": "currentColor" } }, "button": { @@ -276,7 +276,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -299,7 +299,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -322,7 +322,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|base" + "text": "currentColor" } }, "button": { @@ -346,12 +346,12 @@ "elements": { "heading": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } }, "button": { diff --git a/styles/08-midnight.json b/styles/08-midnight.json index 9409a23a..7378ce7a 100644 --- a/styles/08-midnight.json +++ b/styles/08-midnight.json @@ -291,7 +291,7 @@ }, "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -314,7 +314,7 @@ }, "link": { "color": { - "text": "var:preset|color|accent-5" + "text": "currentColor" } } } diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json index 42ae7c13..b406a09d 100644 --- a/styles/colors/06-morning.json +++ b/styles/colors/06-morning.json @@ -192,7 +192,8 @@ }, ":hover": { "color": { - "background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)" + "background": "color-mix(in srgb, var(--wp--preset--color--accent-1) 85%, transparent)", + "text": "var:preset|color|contrast" } } }, From 76dd271cbbfc9bb9e6fafa9a618ce836992695a8 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Tue, 22 Oct 2024 17:29:46 +0200 Subject: [PATCH 06/14] site title --- styles/sections/section-1.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index 397b3a9a..12d9f9ba 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -19,6 +19,18 @@ "text": "color-mix(in srgb, currentColor 25%, transparent)" } }, + "core/site-title": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, "core/post-author-name": { "color": { "text": "currentColor" From d080fe151d38f86fa2418bff0cc7e70825ad39af Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Fri, 25 Oct 2024 18:50:21 +0200 Subject: [PATCH 07/14] Fix parity between variations and color files. Fix contrast issues. --- styles/01-evening.json | 17 ----------------- styles/02-noon.json | 31 ++++++++++--------------------- styles/03-dusk.json | 4 ++-- styles/06-morning.json | 2 +- styles/colors/02-noon.json | 7 ++++++- styles/colors/06-morning.json | 2 +- 6 files changed, 20 insertions(+), 43 deletions(-) diff --git a/styles/01-evening.json b/styles/01-evening.json index 872a4f15..e270f9fe 100644 --- a/styles/01-evening.json +++ b/styles/01-evening.json @@ -66,18 +66,6 @@ } } } - }, - "core/site-tagline": { - "color": { - "text": "var:preset|color|accent-4" - }, - "elements": { - "link": { - "color": { - "text": "var:preset|color|accent-4" - } - } - } } }, "elements": { @@ -100,11 +88,6 @@ "top": "0.6rem" } } - }, - "link": { - "color": { - "text": "var:preset|color|accent-4" - } } }, "variations": { diff --git a/styles/02-noon.json b/styles/02-noon.json index 9c2e15dc..d9f74f17 100644 --- a/styles/02-noon.json +++ b/styles/02-noon.json @@ -107,23 +107,7 @@ "blocks": { "core/button": { "border": { - "bottom": { - "color": "var:preset|color|contrast", - "style": "solid" - }, - "left": { - "color": "var:preset|color|contrast", - "style": "solid" - }, - "radius": "999px", - "right": { - "color": "var:preset|color|contrast", - "style": "solid" - }, - "top": { - "color": "var:preset|color|contrast", - "style": "solid" - } + "color": "var:preset|color|contrast" }, "shadow": "var:preset|shadow|natural", "spacing": { @@ -173,7 +157,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -185,7 +169,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } }, @@ -212,7 +196,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-3" + "text": "currentColor" } } } @@ -267,7 +251,7 @@ }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } } }, @@ -303,6 +287,11 @@ } } }, + "heading": { + "color": { + "text": "var:preset|color|base" + } + }, "link": { "color": { "text": "currentColor" diff --git a/styles/03-dusk.json b/styles/03-dusk.json index 9de28430..c8e61153 100644 --- a/styles/03-dusk.json +++ b/styles/03-dusk.json @@ -86,7 +86,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } @@ -101,7 +101,7 @@ "elements": { "link": { "color": { - "text": "var:preset|color|accent-2" + "text": "currentColor" } } } diff --git a/styles/06-morning.json b/styles/06-morning.json index 062fcd98..90d61948 100644 --- a/styles/06-morning.json +++ b/styles/06-morning.json @@ -235,7 +235,7 @@ }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } } }, diff --git a/styles/colors/02-noon.json b/styles/colors/02-noon.json index fecda91c..67a7b4fc 100644 --- a/styles/colors/02-noon.json +++ b/styles/colors/02-noon.json @@ -109,7 +109,7 @@ }, "link": { "color": { - "text": "var:preset|color|contrast" + "text": "currentColor" } } }, @@ -145,6 +145,11 @@ } } }, + "heading": { + "color": { + "text": "var:preset|color|base" + } + }, "link": { "color": { "text": "currentColor" diff --git a/styles/colors/06-morning.json b/styles/colors/06-morning.json index b406a09d..98f92990 100644 --- a/styles/colors/06-morning.json +++ b/styles/colors/06-morning.json @@ -123,7 +123,7 @@ }, "heading": { "color": { - "text": "currentColor" + "text": "var:preset|color|contrast" } }, "link": { From 187acd094f6e577b8c88a33bd7c255286607b5da Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Fri, 25 Oct 2024 18:58:32 +0200 Subject: [PATCH 08/14] account for more blocks with custom colors --- styles/sections/section-1.json | 48 ++++++++++++++++++++++++++++++++++ styles/sections/section-2.json | 48 ++++++++++++++++++++++++++++++++++ styles/sections/section-3.json | 48 ++++++++++++++++++++++++++++++++++ styles/sections/section-4.json | 48 ++++++++++++++++++++++++++++++++++ styles/sections/section-5.json | 48 ++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index 12d9f9ba..0529cdc4 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -54,6 +54,54 @@ } } } + }, + "core/comment-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-date": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-edit-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-reply-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index 4ec9df34..ec0d3b53 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -42,6 +42,54 @@ } } } + }, + "core/comment-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-date": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-edit-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-reply-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index bb362910..76e56f3f 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -42,6 +42,54 @@ } } } + }, + "core/comment-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-date": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-edit-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-reply-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } } } diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 5158350b..6e3c90a9 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -42,6 +42,54 @@ } } } + }, + "core/comment-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-date": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-edit-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-reply-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } }, "elements": { diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index 87f7e430..7a324223 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -42,6 +42,54 @@ } } } + }, + "core/comment-author-name": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-date": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-edit-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } + }, + "core/comment-reply-link": { + "color": { + "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } + } } }, "elements": { From bbc2e87415f366412e05f1790d2869b6bce6ac49 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Tue, 29 Oct 2024 18:07:35 +0100 Subject: [PATCH 09/14] Noon: Set heading color for section 4 to `currentColor` --- styles/02-noon.json | 5 +++++ styles/colors/02-noon.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/styles/02-noon.json b/styles/02-noon.json index bafd5897..aac33a46 100644 --- a/styles/02-noon.json +++ b/styles/02-noon.json @@ -420,6 +420,11 @@ } } }, + "heading": { + "color": { + "text": "currentColor" + } + }, "link": { "color": { "text": "currentColor" diff --git a/styles/colors/02-noon.json b/styles/colors/02-noon.json index 67a7b4fc..555b2589 100644 --- a/styles/colors/02-noon.json +++ b/styles/colors/02-noon.json @@ -126,6 +126,11 @@ } } }, + "heading": { + "color": { + "text": "currentColor" + } + }, "link": { "color": { "text": "currentColor" From 87117f437b910fceff78b70f4a7f05b90aa88633 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Wed, 30 Oct 2024 15:21:19 +0100 Subject: [PATCH 10/14] Fix quote text color and border color. --- styles/07-sunrise.json | 3 --- styles/colors/07-sunrise.json | 3 --- styles/sections/section-1.json | 5 +++++ styles/sections/section-2.json | 5 +++++ styles/sections/section-3.json | 5 +++++ styles/sections/section-4.json | 5 +++++ styles/sections/section-5.json | 5 +++++ theme.json | 2 +- 8 files changed, 26 insertions(+), 7 deletions(-) diff --git a/styles/07-sunrise.json b/styles/07-sunrise.json index 0ef9efe6..ed60e26b 100644 --- a/styles/07-sunrise.json +++ b/styles/07-sunrise.json @@ -304,9 +304,6 @@ "fontWeight": "600", "letterSpacing": "-0.24px" }, - "border": { - "color": "var:preset|color|accent-2" - }, "elements": { "cite": { "typography": { diff --git a/styles/colors/07-sunrise.json b/styles/colors/07-sunrise.json index 51263b3c..b320026d 100644 --- a/styles/colors/07-sunrise.json +++ b/styles/colors/07-sunrise.json @@ -108,9 +108,6 @@ "color": { "text": "var:preset|color|accent-2" }, - "border": { - "color": "var:preset|color|accent-2" - }, "elements": { "cite": { "color": { diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index 0529cdc4..dacac3f8 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -102,6 +102,11 @@ } } } + }, + "core/quote": { + "color": { + "text": "currentColor" + } } } } diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index ec0d3b53..0ed1cc30 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -90,6 +90,11 @@ } } } + }, + "core/quote": { + "color": { + "text": "currentColor" + } } } } diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 76e56f3f..15c2959e 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -90,6 +90,11 @@ } } } + }, + "core/quote": { + "color": { + "text": "currentColor" + } } } } diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 6e3c90a9..1f39796e 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -90,6 +90,11 @@ } } } + }, + "core/quote": { + "color": { + "text": "currentColor" + } } }, "elements": { diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index 7a324223..e9dcd715 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -90,6 +90,11 @@ } } } + }, + "core/quote": { + "color": { + "text": "currentColor" + } } }, "elements": { diff --git a/theme.json b/theme.json index 425e07d5..e43b5888 100644 --- a/theme.json +++ b/theme.json @@ -428,7 +428,7 @@ "border": { "style": "solid", "width": "0 0 0 2px", - "color": "var:preset|color|contrast" + "color": "currentColor" }, "spacing": { "blockGap": "var:preset|spacing|30", From e125502c766fd32bff1e5b7533ccabe78189b63d Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Wed, 30 Oct 2024 16:57:15 +0100 Subject: [PATCH 11/14] Fix the text color for the pull quote in the different section styles. --- styles/sections/section-1.json | 5 +++++ styles/sections/section-2.json | 5 +++++ styles/sections/section-3.json | 5 +++++ styles/sections/section-4.json | 5 +++++ styles/sections/section-5.json | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index dacac3f8..d1765d16 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -103,6 +103,11 @@ } } }, + "core/pullquote": { + "color": { + "text": "currentColor" + } + }, "core/quote": { "color": { "text": "currentColor" diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index 0ed1cc30..b2eb34cf 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -91,6 +91,11 @@ } } }, + "core/pullquote": { + "color": { + "text": "currentColor" + } + }, "core/quote": { "color": { "text": "currentColor" diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 15c2959e..4d45ab01 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -91,6 +91,11 @@ } } }, + "core/pullquote": { + "color": { + "text": "currentColor" + } + }, "core/quote": { "color": { "text": "currentColor" diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 1f39796e..06029a8a 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -91,6 +91,11 @@ } } }, + "core/pullquote": { + "color": { + "text": "currentColor" + } + }, "core/quote": { "color": { "text": "currentColor" diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index e9dcd715..eb6431b5 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -91,6 +91,11 @@ } } }, + "core/pullquote": { + "color": { + "text": "currentColor" + } + }, "core/quote": { "color": { "text": "currentColor" From 864a03b048a275acd853f3edbea936e89d275d1c Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Wed, 30 Oct 2024 17:04:19 +0100 Subject: [PATCH 12/14] Update link colors for quote and pullquote in section styles. --- styles/sections/section-1.json | 14 ++++++++++++++ styles/sections/section-2.json | 14 ++++++++++++++ styles/sections/section-3.json | 14 ++++++++++++++ styles/sections/section-4.json | 14 ++++++++++++++ styles/sections/section-5.json | 14 ++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index d1765d16..80ae5923 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -106,11 +106,25 @@ "core/pullquote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } }, "core/quote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } } } diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index b2eb34cf..43376c0f 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -94,11 +94,25 @@ "core/pullquote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } }, "core/quote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } } } diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 4d45ab01..9171032e 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -94,11 +94,25 @@ "core/pullquote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } }, "core/quote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } } } diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 06029a8a..a4b079ad 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -94,11 +94,25 @@ "core/pullquote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } }, "core/quote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } } }, diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index eb6431b5..6a8607b9 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -94,11 +94,25 @@ "core/pullquote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } }, "core/quote": { "color": { "text": "currentColor" + }, + "elements": { + "link": { + "color": { + "text": "currentColor" + } + } } } }, From 2718fe1ebc6c1bdbbe09c5c4f6a965f6b6907adf Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Thu, 31 Oct 2024 11:21:00 +0100 Subject: [PATCH 13/14] Remove link styles as not needed. --- styles/sections/section-1.json | 14 -------------- styles/sections/section-2.json | 14 -------------- styles/sections/section-3.json | 14 -------------- styles/sections/section-4.json | 14 -------------- styles/sections/section-5.json | 14 -------------- 5 files changed, 70 deletions(-) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index 80ae5923..d1765d16 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -106,25 +106,11 @@ "core/pullquote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } }, "core/quote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } } } diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index 43376c0f..b2eb34cf 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -94,25 +94,11 @@ "core/pullquote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } }, "core/quote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } } } diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 9171032e..4d45ab01 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -94,25 +94,11 @@ "core/pullquote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } }, "core/quote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } } } diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index a4b079ad..06029a8a 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -94,25 +94,11 @@ "core/pullquote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } }, "core/quote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } } }, diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index 6a8607b9..eb6431b5 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -94,25 +94,11 @@ "core/pullquote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } }, "core/quote": { "color": { "text": "currentColor" - }, - "elements": { - "link": { - "color": { - "text": "currentColor" - } - } } } }, From fc3c6a85002e037843ab4e566fb34e4ee5cd7cb5 Mon Sep 17 00:00:00 2001 From: Juan Aldasoro Date: Thu, 31 Oct 2024 11:21:18 +0100 Subject: [PATCH 14/14] Set color for post date in the different variations. --- styles/sections/section-1.json | 12 ++++++++++++ styles/sections/section-2.json | 12 ++++++++++++ styles/sections/section-3.json | 12 ++++++++++++ styles/sections/section-4.json | 12 ++++++++++++ styles/sections/section-5.json | 12 ++++++++++++ 5 files changed, 60 insertions(+) diff --git a/styles/sections/section-1.json b/styles/sections/section-1.json index d1765d16..fa153a40 100644 --- a/styles/sections/section-1.json +++ b/styles/sections/section-1.json @@ -43,6 +43,18 @@ } } }, + "core/post-date": { + "color":{ + "text": "color-mix(in srgb, currentColor 85%, transparent)" + }, + "elements": { + "link": { + "color" : { + "text": "color-mix(in srgb, currentColor 85%, transparent)" + } + } + } + }, "core/post-terms": { "color": { "text": "currentColor" diff --git a/styles/sections/section-2.json b/styles/sections/section-2.json index b2eb34cf..e8608327 100644 --- a/styles/sections/section-2.json +++ b/styles/sections/section-2.json @@ -31,6 +31,18 @@ } } }, + "core/post-date": { + "color":{ + "text": "color-mix(in srgb, currentColor 85%, transparent)" + }, + "elements": { + "link": { + "color" : { + "text": "color-mix(in srgb, currentColor 85%, transparent)" + } + } + } + }, "core/post-terms": { "color": { "text": "currentColor" diff --git a/styles/sections/section-3.json b/styles/sections/section-3.json index 4d45ab01..b706a319 100644 --- a/styles/sections/section-3.json +++ b/styles/sections/section-3.json @@ -31,6 +31,18 @@ } } }, + "core/post-date": { + "color":{ + "text": "color-mix(in srgb, currentColor 85%, transparent)" + }, + "elements": { + "link": { + "color" : { + "text": "color-mix(in srgb, currentColor 85%, transparent)" + } + } + } + }, "core/post-terms": { "color": { "text": "currentColor" diff --git a/styles/sections/section-4.json b/styles/sections/section-4.json index 06029a8a..47208dc9 100644 --- a/styles/sections/section-4.json +++ b/styles/sections/section-4.json @@ -31,6 +31,18 @@ } } }, + "core/post-date": { + "color":{ + "text": "color-mix(in srgb, currentColor 85%, transparent)" + }, + "elements": { + "link": { + "color" : { + "text": "color-mix(in srgb, currentColor 85%, transparent)" + } + } + } + }, "core/post-terms": { "color": { "text": "currentColor" diff --git a/styles/sections/section-5.json b/styles/sections/section-5.json index eb6431b5..c616a425 100644 --- a/styles/sections/section-5.json +++ b/styles/sections/section-5.json @@ -31,6 +31,18 @@ } } }, + "core/post-date": { + "color":{ + "text": "color-mix(in srgb, currentColor 85%, transparent)" + }, + "elements": { + "link": { + "color" : { + "text": "color-mix(in srgb, currentColor 85%, transparent)" + } + } + } + }, "core/post-terms": { "color": { "text": "currentColor"