added separators back to pricing and removed base 3 entirely

WordPress · Nov 6, 2023 · 8c8afc3 · 8c8afc3
1 parent 9cd2de3
commit 8c8afc3
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 42 deletions.
diff --git 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
@@ -29,8 +29,8 @@
 
 		<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|20"}}}} -->
 		<div class="wp-block-columns alignwide">
-			<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30","top":"var:preset|spacing|30","bottom":"var:preset|spacing|10"}},"border":{"top":{"color":"var:preset|color|base-3","width":"1px"}}}} -->
-			<div class="wp-block-column" style="border-top-color:var(--wp--preset--color--base-3);border-top-width:1px;padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10);padding-left:var(--wp--preset--spacing--30)">
+			<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30","top":"var:preset|spacing|30","bottom":"var:preset|spacing|10"}},"border":{"top":{"color":"var:preset|color|contrast-3","width":"1px"}}}} -->
+			<div class="wp-block-column" style="border-top-color:var(--wp--preset--color--contrast-3);border-top-width:1px;padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10);padding-left:var(--wp--preset--spacing--30)">
 				<!-- wp:heading {"textAlign":"center","level":4,"style":{"spacing":{"padding":{"top":"1px"}}},"fontSize":"medium"} -->
 				<h4 class="wp-block-heading has-text-align-center has-medium-font-size" style="padding-top:1px">
 					<em><?php echo esc_html_x( 'Free', 'Sample heading for the first pricing level', 'twentytwentyfour' ); ?></em>
@@ -52,12 +52,20 @@
 					<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Access to 5 exclusive <em>Études Articles</em> per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
 					<p class="has-text-align-center has-contrast-2-color has-text-color has-link-color">
 						<s><?php echo esc_html_x( 'Weekly print edition.', 'Feature for pricing level', 'twentytwentyfour' ); ?></s>
 					</p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast-2"}}}},"textColor":"contrast-2"} -->
 					<p class="has-text-align-center has-contrast-2-color has-text-color has-link-color">
 						<s><?php echo wp_kses_post( _x( 'Exclusive access to the <em>Études</em> app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></s>
@@ -106,10 +114,18 @@
 					<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Access to 20 exclusive <em>Études Articles</em> per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center"} -->
 					<p class="has-text-align-center"><?php echo esc_html_x( 'Weekly print edition.', 'Feature for pricing level', 'twentytwentyfour' ); ?></p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center"} -->
 					<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Exclusive access to the <em>Études</em> app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></p>
 					<!-- /wp:paragraph -->
@@ -133,8 +149,8 @@
 			</div>
 			<!-- /wp:column -->
 
-			<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30","top":"var:preset|spacing|30","bottom":"var:preset|spacing|10"}},"border":{"top":{"color":"var:preset|color|base-3","width":"1px"}}}} -->
-			<div class="wp-block-column" style="border-top-color:var(--wp--preset--color--base-3);border-top-width:1px;padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10);padding-left:var(--wp--preset--spacing--30)">
+			<!-- wp:column {"style":{"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30","top":"var:preset|spacing|30","bottom":"var:preset|spacing|10"}},"border":{"top":{"color":"var:preset|color|contrast-3","width":"1px"}}}} -->
+			<div class="wp-block-column" style="border-top-color:var(--wp--preset--color--contrast-3);border-top-width:1px;padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--10);padding-left:var(--wp--preset--spacing--30)">
 				<!-- wp:heading {"textAlign":"center","level":4,"style":{"spacing":{"padding":{"top":"1px"}}},"fontSize":"medium"} -->
 				<h4 class="wp-block-heading has-text-align-center has-medium-font-size" style="padding-top:1px">
 					<em><?php echo esc_html_x( 'Expert', 'Sample heading for the third pricing level', 'twentytwentyfour' ); ?></em>
@@ -156,10 +172,18 @@
 					<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Exclusive, unlimited access to <em>Études Articles</em>.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center"} -->
 					<p class="has-text-align-center"><?php echo esc_html_x( 'Weekly print edition.', 'Feature for pricing level', 'twentytwentyfour' ); ?></p>
 					<!-- /wp:paragraph -->
 
+					<!-- wp:separator {"backgroundColor":"contrast-3"} -->
+					<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" />
+					<!-- /wp:separator -->
+
 					<!-- wp:paragraph {"align":"center"} -->
 					<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Exclusive access to the <em>Études</em> app for iOS and Android', 'Feature for pricing level', 'twentytwentyfour' ) ); ?></p>
 					<!-- /wp:paragraph -->

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -31,8 +31,8 @@
 			</div>
 			<!-- /wp:spacer -->
 
-			<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}},"backgroundColor":"base-3","className":"is-style-wide"} -->
-			<hr class="wp-block-separator has-text-color has-base-3-color has-alpha-channel-opacity has-base-3-background-color has-background is-style-wide" style="margin-bottom:var(--wp--preset--spacing--40)"/>
+			<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}},"backgroundColor":"contrast-3","className":"is-style-wide"} -->
+			<hr class="wp-block-separator has-text-color has-contrast-3-color has-alpha-channel-opacity has-contrast-3-background-color has-background is-style-wide" style="margin-bottom:var(--wp--preset--spacing--40)"/>
 			<!-- /wp:separator -->
 
 			<!-- wp:pattern {"slug":"twentytwentyfour/hidden-comments"} /-->

diff --git 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",