From 2d256447524e298c4e520d465b68ef41a6006084 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Tue, 9 Aug 2022 07:19:33 +0100
Subject: [PATCH] Archeo: move CSS styles to theme.json (#6159)

* Move button styles from CSS to theme.json

* Move comments button styles to theme.json

* Move footer gap styles to theme.json

* Disable wp-block-styles

* Tweak footer column gap size

* Enable wp-block-styles again

* Add search and file button CSS back

* Fix merge conflicts

* Move uppercase to core/button

* Remove duplicate button element settings

* Move text transform back to button element

* Reduce vertical gap in footer nav

* Fix normal font size ref

* Remove more CSS

* Fix indentation

* Second attempt at fixing indentation
---
 archeo/patterns/footer.php |  2 +-
 archeo/style.css           | 16 ----------------
 archeo/theme.json          | 17 ++++++++++-------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/archeo/patterns/footer.php b/archeo/patterns/footer.php
index bff99f812..5b3f29cc7 100644
--- a/archeo/patterns/footer.php
+++ b/archeo/patterns/footer.php
@@ -11,7 +11,7 @@
 <div class="wp-block-group">
 	<!-- wp:group {"align":"wide","layout":{"type":"flex","justifyContent":"space-between"},"style":{"spacing":{"padding":{"bottom":"var(--wp--custom--spacing--medium)","top":"var(--wp--custom--spacing--medium)"}}}} -->
 	<div class="wp-block-group alignwide" style="padding-top: var(--wp--custom--spacing--medium); padding-bottom: var(--wp--custom--spacing--medium);">
-		<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left"},"overlayMenu":"never","className":"site-footer","style":{"typography":{"fontStyle":"normal"},"spacing":{"blockGap":"2.5rem"}},"fontSize":"small"} /-->
+		<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left"},"overlayMenu":"never","className":"site-footer","style":{"typography":{"fontStyle":"normal"},"spacing":{"blockGap":{"top":"0.5em","left":"2.5em","bottom":"0.5rem","right":"2.5em"}}},"fontSize":"small"} /-->
 		<!-- wp:paragraph {"align":"left","fontSize":"small","style":{"spacing":{"margin":{"top":0}}}} -->
 		<p class="has-small-font-size" style="margin-top: 0;">
 			<?php
diff --git a/archeo/style.css b/archeo/style.css
index 614b3061a..4d30e1395 100644
--- a/archeo/style.css
+++ b/archeo/style.css
@@ -87,7 +87,6 @@ a:active,
 	padding-bottom: 0.667em;
 }
 
-
 /*
  * Comment Form Fields
  */
@@ -126,14 +125,6 @@ a:active,
 	text-decoration: none;
 }
 
-/*
- * Needed until https://github.com/WordPress/gutenberg/issues/29167 is addressed.
- */
-.wp-block-post-comments input[type=submit].wp-block-button__link {
-	background-color: var(--wp--preset--color--background);
-	color: var(--wp--preset--color--foreground);
-}
-
 /*
  * Needed until https://github.com/WordPress/gutenberg/issues/38498 is fixed.
  */
@@ -151,10 +142,3 @@ a:active,
 .wp-block-post-title a:hover {
 	text-decoration-line: underline;
 }
-
-/*
- * Needed until https://github.com/WordPress/gutenberg/issues/34529 is fixed.
- */
-.site-footer {
-	row-gap: 0.5rem !important;
-}
diff --git a/archeo/theme.json b/archeo/theme.json
index d24f5208d..2a9044ebf 100644
--- a/archeo/theme.json
+++ b/archeo/theme.json
@@ -166,11 +166,6 @@
 	},
 	"styles": {
 		"blocks": {
-			"core/button": {
-				"typography": {
-					"textTransform": "uppercase"
-				}
-			},
 			"core/heading": {
 				"typography": {
 					"fontWeight": "100",
@@ -184,6 +179,12 @@
 			},
 			"core/post-comments": {
 				"elements": {
+					"button": {
+						"color": {
+							"background": "var(--wp--preset--color--background)",
+							"text": "var(--wp--preset--color--foreground)"
+						}
+					},
 					"h3": {
 						"typography": {
 							"textTransform": "uppercase"
@@ -258,7 +259,8 @@
 		"elements": {
 			"button": {
 				"border": {
-					"radius": "0"
+					"radius": "0",
+					"width": "0"
 				},
 				"color": {
 					"background": "var(--wp--preset--color--foreground)",
@@ -274,7 +276,8 @@
 				},
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--chivo)",
-					"fontSize": "var(--wp--preset--font-size--normal)"
+					"fontSize": "var(--wp--preset--font-size--normal)",
+					"textTransform": "uppercase"
 				}
 			},
 			"h1": {