From 06c88102d27b02bef7e5f0690fccad8038722275 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Sun, 5 Nov 2023 20:26:40 -0500 Subject: [PATCH 1/5] Use contrast instead for FAQ --- patterns/text-faq.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/patterns/text-faq.php b/patterns/text-faq.php index 9ebe08b7..8bf04281 100644 --- a/patterns/text-faq.php +++ b/patterns/text-faq.php @@ -16,12 +16,12 @@
- -
+ +
- -
+ +

@@ -29,8 +29,8 @@
- -
+ +

@@ -38,8 +38,8 @@
- -
+ +

@@ -47,8 +47,8 @@
- -
+ +

From 6bec6548f9a0090c48dc3c2cac3f7ad0952cf909 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Sun, 5 Nov 2023 20:29:26 -0500 Subject: [PATCH 2/5] Remove border bottom from arrow style details --- functions.php | 1 - 1 file changed, 1 deletion(-) diff --git a/functions.php b/functions.php index 2dbd0535..4cb8329a 100644 --- a/functions.php +++ b/functions.php @@ -50,7 +50,6 @@ function twentytwentyfour_block_styles() { .is-style-arrow-icon-details { padding-top: var(--wp--preset--spacing--10); padding-bottom: var(--wp--preset--spacing--10); - border-bottom: 1px solid var(--wp--preset--color--contrast-2, currentColor); } .is-style-arrow-icon-details summary { From dc5d331e03bd6299ba50010f6467ce9155d7f5b7 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Sun, 5 Nov 2023 20:35:47 -0500 Subject: [PATCH 3/5] Remove seps from pricing --- patterns/cta-pricing.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/patterns/cta-pricing.php b/patterns/cta-pricing.php index 78665ceb..f18a9d08 100644 --- a/patterns/cta-pricing.php +++ b/patterns/cta-pricing.php @@ -52,20 +52,12 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
- -

- -
- -

Études app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?> @@ -114,18 +106,10 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
- -

- -
- -

Études app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

@@ -172,18 +156,10 @@

Études Articles.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

- -
- -

- -
- -

Études app for iOS and Android', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

From 9cd2de3b9f1ad6c805ac9f7f41524ae6e287bb25 Mon Sep 17 00:00:00 2001 From: Rich Tabor Date: Sun, 5 Nov 2023 20:35:55 -0500 Subject: [PATCH 4/5] Use contrast on seps in sidebar template --- patterns/hidden-sidebar.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patterns/hidden-sidebar.php b/patterns/hidden-sidebar.php index 46e40d0f..abcb01b7 100644 --- a/patterns/hidden-sidebar.php +++ b/patterns/hidden-sidebar.php @@ -23,8 +23,8 @@
- -
+ +
@@ -37,8 +37,8 @@ - -
+ +
@@ -62,8 +62,8 @@ - -
+ +
From 8c8afc34a5f753f6b2c230fa1c5c7887d54ff81f Mon Sep 17 00:00:00 2001 From: MaggieCabrera Date: Mon, 6 Nov 2023 10:29:05 +0100 Subject: [PATCH 5/5] added separators back to pricing and removed base 3 entirely --- README.md | 1 - patterns/cta-pricing.php | 32 ++++++++++++++++++++++++++++---- styles/ember.json | 5 ----- styles/fossil.json | 5 ----- styles/ice.json | 5 ----- styles/maelstrom.json | 5 ----- styles/mint.json | 5 ----- styles/onyx.json | 5 ----- templates/single.html | 4 ++-- theme.json | 5 ----- 10 files changed, 30 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 08c192f1..289c71cc 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ As a default WordPress theme, it is important to leverage the existing design sy |------------|-----------------------------|-----------|------|--------|----------------------------------------------------------| | `Base/One` | `--wp--preset--color--base` | `#f9f9f9` | Base | `base` | ![](https://placehold.co/15x15/f9f9f9/f9f9f9.png) | | `Base/Two` | `--wp--preset--color--base-2` | `#ffffff` | Base / Two | `base-2` | ![](https://placehold.co/15x15/ffffff/ffffff.png) | -| `Base/Three` | `--wp--preset--color--base-3` | `#00000025` | Base / Three | `base-3` | ![](https://placehold.co/15x15/00000025/00000025.png) | | `Contrast/One` | `--wp--preset--color--contrast` | `#111111` | Contrast | `contrast` | ![](https://placehold.co/15x15/111111/111111.png) | | `Contrast/Two` | `--wp--preset--color--contrast-2` | `#636363` | Contrast / Two | `contrast-2` | ![](https://placehold.co/15x15/636363/636363.png) | | `Contrast/Three` | `--wp--preset--color--contrast-3` | `#a4a4a4` | Contrast / Three | `contrast-3` | ![](https://placehold.co/15x15/a4a4a4/a4a4a4.png) | diff --git a/patterns/cta-pricing.php b/patterns/cta-pricing.php index f18a9d08..45f85f5f 100644 --- a/patterns/cta-pricing.php +++ b/patterns/cta-pricing.php @@ -29,8 +29,8 @@
- -
+ +

@@ -52,12 +52,20 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ +
+ +

+ +
+ +

Études app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?> @@ -106,10 +114,18 @@

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ +
+ +

+ +
+ +

Études app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

@@ -133,8 +149,8 @@

- -
+ +

@@ -156,10 +172,18 @@

Études Articles.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ +
+ +

+ +
+ +

Études app for iOS and Android', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

diff --git a/styles/ember.json b/styles/ember.json index a7eb7a4f..37e9c418 100644 --- a/styles/ember.json +++ b/styles/ember.json @@ -96,11 +96,6 @@ "color": "#f6decd", "name": "Base / Two", "slug": "base-2" - }, - { - "color": "#FF3C0025", - "name": "Base / Three", - "slug": "base-3" } ] }, diff --git a/styles/fossil.json b/styles/fossil.json index 41950f84..44e24fca 100644 --- a/styles/fossil.json +++ b/styles/fossil.json @@ -77,11 +77,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#1A151425", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#1A1514", "name": "Contrast", diff --git a/styles/ice.json b/styles/ice.json index 482b65bf..e7896bcb 100644 --- a/styles/ice.json +++ b/styles/ice.json @@ -77,11 +77,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#ecf1f4", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#1C2930", "name": "Contrast", diff --git a/styles/maelstrom.json b/styles/maelstrom.json index e4ad142a..1f99cf5b 100644 --- a/styles/maelstrom.json +++ b/styles/maelstrom.json @@ -15,11 +15,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#FFFFFF25", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#FFFFFFA1", "name": "Contrast / 2", diff --git a/styles/mint.json b/styles/mint.json index e9b6efd7..9d306e50 100644 --- a/styles/mint.json +++ b/styles/mint.json @@ -15,11 +15,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#00000025", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#000000", "name": "Contrast", diff --git a/styles/onyx.json b/styles/onyx.json index d5c9359b..41afbd8c 100644 --- a/styles/onyx.json +++ b/styles/onyx.json @@ -119,11 +119,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#ffffff26", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#f9f9f9", "name": "Contrast", diff --git a/templates/single.html b/templates/single.html index fced18d1..e2633701 100644 --- a/templates/single.html +++ b/templates/single.html @@ -31,8 +31,8 @@

- -
+ +
diff --git a/theme.json b/theme.json index fad7f6be..5de83dfe 100644 --- a/theme.json +++ b/theme.json @@ -111,11 +111,6 @@ "name": "Base / Two", "slug": "base-2" }, - { - "color": "#00000025", - "name": "Base / Three", - "slug": "base-3" - }, { "color": "#111111", "name": "Contrast",