From e58c3f9b6dfadd4be7eafc6646b1eac698e65e8b Mon Sep 17 00:00:00 2001
From: Takashi Irie <takashi@automattic.com>
Date: Wed, 13 Sep 2023 20:19:30 +0100
Subject: [PATCH] Raifall: Make sure the elements don't bump to the screen
 edges (#7365)

---
 rainfall/parts/footer.html       | 10 +++++-----
 rainfall/parts/header.html       |  8 ++++----
 rainfall/patterns/big-header.php | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rainfall/parts/footer.html b/rainfall/parts/footer.html
index f6800ed19..6796a450d 100644
--- a/rainfall/parts/footer.html
+++ b/rainfall/parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|110"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--110)"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+<!-- wp:group {"layout":{"type":"default"}} -->
+<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|110","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--110);padding-right:var(--wp--preset--spacing--90);padding-left:var(--wp--preset--spacing--90)"><!-- 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","overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
+<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"var:preset|spacing|90"}}} /--></div>
 <!-- /wp:group --></div>
 <!-- /wp:group --></div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/rainfall/parts/header.html b/rainfall/parts/header.html
index 4e56877b4..5ff293d8b 100644
--- a/rainfall/parts/header.html
+++ b/rainfall/parts/header.html
@@ -1,8 +1,8 @@
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60)"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
+<!-- wp:group {"layout":{"type":"default"}} -->
+<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+<div class="wp-block-group" style="padding-top:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--90);padding-left:var(--wp--preset--spacing--90)"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
 
-<!-- wp:navigation {"hasIcon":false,"overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|90"},"typography":{"textTransform":"uppercase"}}} /--></div>
+<!-- wp:navigation {"overlayMenu":"never","overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"var:preset|spacing|90"}}} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"var(--wp--preset--spacing--110)"} -->
diff --git a/rainfall/patterns/big-header.php b/rainfall/patterns/big-header.php
index 2f3078276..0273bee56 100644
--- a/rainfall/patterns/big-header.php
+++ b/rainfall/patterns/big-header.php
@@ -6,11 +6,11 @@
  */
 ?>
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
+<!-- wp:group {"layout":{"type":"default"},"style":{"spacing":{"padding":{"right":"var:preset|spacing|90","left":"var:preset|spacing|90"}}}} -->
+<div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--90);padding-left:var(--wp--preset--spacing--90)">
 
-<!-- wp:columns {"align":"full"} -->
-<div class="wp-block-columns alignfull">
+<!-- wp:columns -->
+<div class="wp-block-columns">
 <!-- wp:column {"width":"75%"} -->
 <div class="wp-block-column" style="flex-basis:75%">
 <!-- wp:heading {"className":"indented-post-title","fontSize":"xx-large"} -->
@@ -21,8 +21,8 @@
 </div>
 <!-- /wp:columns -->
 
-<!-- wp:columns {"align":"full"} -->
-<div class="wp-block-columns alignfull"><!-- wp:column {"verticalAlignment":"bottom","width":"33.33%"} -->
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"verticalAlignment":"bottom","width":"33.33%"} -->
 <div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:33.33%"><!-- wp:heading {"fontSize":"xx-large"} -->
 <h2 class="has-xx-large-font-size"><?php echo esc_html__( '002', 'rainfall' ); ?></h2>
 <!-- /wp:heading -->