From d3479fc0916b5a349f9d14e40912faa55c41b896 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 25 Jul 2022 17:35:14 +0100
Subject: [PATCH 01/10] Make header and footer full width

---
 rainfall/parts/footer.html     | 4 ++--
 rainfall/parts/header.html     | 4 ++--
 rainfall/templates/single.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index badcc779d0..7933efc9b9 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -1,6 +1,6 @@
 <!-- wp:group {"layout":{"inherit":"true"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignwide" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","fontSize":"small"} /-->
+<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","fontSize":"small"} /-->
 
 <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group"><!-- wp:paragraph -->
diff --git a/rainfall/parts/header.html b/rainfall/parts/header.html
index 3b4ca7de10..48476f1dd4 100644
--- a/rainfall/parts/header.html
+++ b/rainfall/parts/header.html
@@ -1,6 +1,6 @@
 <!-- wp:group {"layout":{"inherit":"true"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"30px","top":"30px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignwide" style="padding-top:30px;padding-bottom:30px"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"30px","top":"30px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:30px"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
 <!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"2.87rem"}}} /--></div>
 <!-- /wp:group -->
diff --git a/rainfall/templates/single.html b/rainfall/templates/single.html
index e2d6814076..90f58367c0 100644
--- a/rainfall/templates/single.html
+++ b/rainfall/templates/single.html
@@ -93,8 +93,8 @@
 <div class="wp-block-group"></div>
 <!-- /wp:group -->
 
-<!-- wp:columns {"align":"wide"} -->
-<div class="wp-block-columns alignwide"><!-- wp:column -->
+<!-- wp:columns {"align":"full"} -->
+<div class="wp-block-columns alignfull"><!-- wp:column -->
 <div class="wp-block-column"><!-- wp:template-part {"slug":"footer"} /--></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns --></div>

From f0b5477791e89838353564b42bb716b6223d4843 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 25 Jul 2022 17:37:07 +0100
Subject: [PATCH 02/10] Make all text in footer uppercase

---
 rainfall/parts/footer.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index 7933efc9b9..3f356332ae 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -1,9 +1,9 @@
 <!-- wp:group {"layout":{"inherit":"true"}} -->
 <div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","fontSize":"small"} /-->
+<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
+<!-- wp:group {"style":{"typography":{"textTransform":"uppercase"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group" style="text-transform:uppercase"><!-- wp:paragraph -->
 <p><a href="https://facebook.com/">Facebook</a></p>
 <!-- /wp:paragraph -->
 

From 40e495b49d5081d25b2e48fa07ed3114af4172c6 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 25 Jul 2022 17:40:08 +0100
Subject: [PATCH 03/10] Allow footer content to wrap at smaller screens

---
 rainfall/parts/footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index 3f356332ae..4d79f1bbf6 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -1,8 +1,8 @@
 <!-- wp:group {"layout":{"inherit":"true"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:group {"style":{"typography":{"textTransform":"uppercase"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<!-- wp:group {"style":{"typography":{"textTransform":"uppercase"}},"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
 <div class="wp-block-group" style="text-transform:uppercase"><!-- wp:paragraph -->
 <p><a href="https://facebook.com/">Facebook</a></p>
 <!-- /wp:paragraph -->

From 3e7a03d83fa100a12538eb554c19f6ff6999f092 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 25 Jul 2022 18:01:38 +0100
Subject: [PATCH 04/10] Style navigation overlay

---
 rainfall/parts/header.html |  2 +-
 rainfall/style.css         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rainfall/parts/header.html b/rainfall/parts/header.html
index 48476f1dd4..823be92f90 100644
--- a/rainfall/parts/header.html
+++ b/rainfall/parts/header.html
@@ -2,7 +2,7 @@
 <div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"30px","top":"30px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:30px"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"2.87rem"}}} /--></div>
+<!-- wp:navigation {"hasIcon":false,"overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"2.87rem"},"typography":{"textTransform":"uppercase"}}} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"60px"} -->
diff --git a/rainfall/style.css b/rainfall/style.css
index 74f53fd4fd..3cd60571e2 100644
--- a/rainfall/style.css
+++ b/rainfall/style.css
@@ -96,3 +96,13 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 	margin-right: auto !important;
 	width: inherit;
 }
+
+/* Navigation Overlay */
+.wp-block-navigation__responsive-container.is-menu-open ul {
+	font-size: var(--wp--preset--font-size--x-large) !important;
+	gap: 0 !important;
+}
+
+.wp-block-navigation__responsive-container.is-menu-open .has-child .wp-block-navigation__submenu-container {
+	padding-top: 0;
+}
\ No newline at end of file

From 30ff68d4ab4be48bb58c0aab7f34717f44ade401 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 1 Aug 2022 10:21:23 +0100
Subject: [PATCH 05/10] Style overlay menu trigger

---
 rainfall/style.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rainfall/style.css b/rainfall/style.css
index 3cd60571e2..008a6be1a9 100644
--- a/rainfall/style.css
+++ b/rainfall/style.css
@@ -105,4 +105,9 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 
 .wp-block-navigation__responsive-container.is-menu-open .has-child .wp-block-navigation__submenu-container {
 	padding-top: 0;
-}
\ No newline at end of file
+}
+
+/* Navigation Overlay Trigger */
+.wp-block-navigation__responsive-container-open {
+	text-transform: uppercase;
+}

From 35e0e99a7ad2f35978f0e55b2d5d2ef30c7f47fe Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 1 Aug 2022 10:28:46 +0100
Subject: [PATCH 06/10] Add header/footer tag names

---
 rainfall/templates/404.html               | 4 ++--
 rainfall/templates/page-header-black.html | 2 +-
 rainfall/templates/page-no-sidebar.html   | 4 ++--
 rainfall/templates/page.html              | 4 ++--
 rainfall/templates/single.html            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rainfall/templates/404.html b/rainfall/templates/404.html
index 12d9bb36f1..1d53d02159 100644
--- a/rainfall/templates/404.html
+++ b/rainfall/templates/404.html
@@ -1,6 +1,6 @@
 <!-- wp:group {"backgroundColor":"light-orange"} -->
 <div class="wp-block-group has-light-orange-background-color has-background">
-    <!-- wp:template-part {"slug":"header"} /-->
+    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 </div>
 <!-- /wp:group -->
 
@@ -10,4 +10,4 @@
 </main>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
diff --git a/rainfall/templates/page-header-black.html b/rainfall/templates/page-header-black.html
index 52501aab8a..6281237eb1 100644
--- a/rainfall/templates/page-header-black.html
+++ b/rainfall/templates/page-header-black.html
@@ -40,4 +40,4 @@
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/page-no-sidebar.html b/rainfall/templates/page-no-sidebar.html
index dc10177cf9..2564263d95 100644
--- a/rainfall/templates/page-no-sidebar.html
+++ b/rainfall/templates/page-no-sidebar.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
 <div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
@@ -33,4 +33,4 @@
 </div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
diff --git a/rainfall/templates/page.html b/rainfall/templates/page.html
index 21774b2c12..e65a474056 100644
--- a/rainfall/templates/page.html
+++ b/rainfall/templates/page.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
 <div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
@@ -38,4 +38,4 @@
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/rainfall/templates/single.html b/rainfall/templates/single.html
index 90f58367c0..e1840abb55 100644
--- a/rainfall/templates/single.html
+++ b/rainfall/templates/single.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
 <div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
@@ -95,7 +95,7 @@
 
 <!-- wp:columns {"align":"full"} -->
 <div class="wp-block-columns alignfull"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:template-part {"slug":"footer"} /--></div>
+<div class="wp-block-column"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
\ No newline at end of file

From 30b430cc0659f0044383ddd518837034398d409e Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 1 Aug 2022 10:38:20 +0100
Subject: [PATCH 07/10] Replace footer links with nav block

---
 rainfall/parts/footer.html | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index 4d79f1bbf6..1b6dca86d5 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -2,18 +2,8 @@
 <div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
 <div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:group {"style":{"typography":{"textTransform":"uppercase"}},"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
-<div class="wp-block-group" style="text-transform:uppercase"><!-- wp:paragraph -->
-<p><a href="https://facebook.com/">Facebook</a></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph {"align":"right"} -->
-<p class="has-text-align-right"><a href="https://instagram.com/">Instagram</a></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center"><a href="https://twitter.com/">Twitter</a></p>
-<!-- /wp:paragraph --></div>
+<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
+<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"right"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
\ No newline at end of file

From c29a741898343b6b67f43c4e94da3d90dbf22394 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 1 Aug 2022 10:44:13 +0100
Subject: [PATCH 08/10] Tweak footer nav styling

---
 rainfall/parts/footer.html | 2 +-
 rainfall/style.css         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index 1b6dca86d5..ffbec42be2 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -3,7 +3,7 @@
 <div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
 <!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
-<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"right"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
+<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/rainfall/style.css b/rainfall/style.css
index 008a6be1a9..c90187030b 100644
--- a/rainfall/style.css
+++ b/rainfall/style.css
@@ -97,6 +97,11 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 	width: inherit;
 }
 
+/* Footer Navigation */
+footer .wp-block-navigation__container {
+	row-gap: 1rem;
+}
+
 /* Navigation Overlay */
 .wp-block-navigation__responsive-container.is-menu-open ul {
 	font-size: var(--wp--preset--font-size--x-large) !important;

From a232e2cae030a96739eed48d02f5bd5a85315ffe Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Mon, 1 Aug 2022 12:30:00 +0100
Subject: [PATCH 09/10] Style current menu item; add GB issues

---
 rainfall/style.css | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rainfall/style.css b/rainfall/style.css
index c90187030b..4f9f4f9d0e 100644
--- a/rainfall/style.css
+++ b/rainfall/style.css
@@ -102,7 +102,16 @@ footer .wp-block-navigation__container {
 	row-gap: 1rem;
 }
 
-/* Navigation Overlay */
+/** Navigation Current Menu Item
+ * Needed until this is addressed: https://github.com/WordPress/gutenberg/issues/42299
+ */
+.wp-block-navigation-item.current-menu-item > a {
+	font-weight: 700;
+}
+
+/** Navigation Overlay
+ * Needed until this is addressed: https://github.com/WordPress/gutenberg/issues/39142
+ */
 .wp-block-navigation__responsive-container.is-menu-open ul {
 	font-size: var(--wp--preset--font-size--x-large) !important;
 	gap: 0 !important;
@@ -112,7 +121,6 @@ footer .wp-block-navigation__container {
 	padding-top: 0;
 }
 
-/* Navigation Overlay Trigger */
 .wp-block-navigation__responsive-container-open {
 	text-transform: uppercase;
 }

From 0bb5a4a9a7e9648d7380fabc2c328f06670cdcfb Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Tue, 2 Aug 2022 15:51:57 +0100
Subject: [PATCH 10/10] remove link color from group

---
 rainfall/templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rainfall/templates/index.html b/rainfall/templates/index.html
index 41050525b2..2cc6899b46 100644
--- a/rainfall/templates/index.html
+++ b/rainfall/templates/index.html
@@ -1,5 +1,5 @@
-<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"backgroundColor":"light-orange","textColor":"black"} -->
-<div class="wp-block-group has-black-color has-light-orange-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<!-- wp:group {"backgroundColor":"light-orange"} -->
+<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
 <div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
@@ -22,4 +22,4 @@
 
 <!-- wp:template-part {"slug":"query"} /-->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->