From dedb1cf0a3305926d21f9bcf77abc3f6f960808f Mon Sep 17 00:00:00 2001
From: Kelly Dwan <ryelle@users.noreply.github.com>
Date: Thu, 29 Aug 2024 14:47:00 -0400
Subject: [PATCH] Templates: Fix spacing and alignment on pages

---
 themes/wporg-5ftf-2024/patterns/single-5ftf-pledge.php   | 4 ++--
 themes/wporg-5ftf-2024/templates/page.html               | 4 ++--
 themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/themes/wporg-5ftf-2024/patterns/single-5ftf-pledge.php b/themes/wporg-5ftf-2024/patterns/single-5ftf-pledge.php
index e633091..04f4d0f 100644
--- a/themes/wporg-5ftf-2024/patterns/single-5ftf-pledge.php
+++ b/themes/wporg-5ftf-2024/patterns/single-5ftf-pledge.php
@@ -8,8 +8,8 @@
 ?>
 <!-- wp:group {"align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"},"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 <div class="wp-block-group alignwide" style="margin-bottom:var(--wp--preset--spacing--40)">
-	<!-- wp:group {"style":{"border":{"style":"solid","width":"1px","color":"#d9d9d9","radius":"2px"}},"backgroundColor":"light-grey-2","layout":{"type":"constrained"}} -->
-	<div class="wp-block-group has-border-color has-light-grey-2-background-color has-background" style="border-color:#d9d9d9;border-style:solid;border-width:1px;border-radius:2px">
+	<!-- wp:group {"style":{"border":{"style":"solid","width":"1px","color":"#d9d9d9","radius":"2px"},"spacing":{"padding":{"top":"var:preset|spacing|10","bottom":"var:preset|spacing|10","left":"var:preset|spacing|10","right":"var:preset|spacing|10"}}},"backgroundColor":"light-grey-2","layout":{"type":"constrained"}} -->
+	<div class="wp-block-group has-border-color has-light-grey-2-background-color has-background" style="border-color:#d9d9d9;border-style:solid;border-width:1px;border-radius:2px;padding-top:var(--wp--preset--spacing--10);padding-right:var(--wp--preset--spacing--10);padding-bottom:var(--wp--preset--spacing--10);padding-left:var(--wp--preset--spacing--10)">
 		<!-- wp:post-featured-image {"aspectRatio":"1","width":"110px","scale":"contain"} /-->
 	</div>
 	<!-- /wp:group -->
diff --git a/themes/wporg-5ftf-2024/templates/page.html b/themes/wporg-5ftf-2024/templates/page.html
index 583924d..355b9de 100644
--- a/themes/wporg-5ftf-2024/templates/page.html
+++ b/themes/wporg-5ftf-2024/templates/page.html
@@ -13,8 +13,8 @@
 </article>
 <!-- /wp:group -->
 	
-<!-- wp:spacer -->
-<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- wp:spacer {"height":"var:preset|spacing|40","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
+<div style="margin-top:var(--wp--preset--spacing--40);height:0" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 	
 <!-- wp:template-part {"slug":"footer"} /-->
diff --git a/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html b/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html
index 586135f..6656da0 100644
--- a/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html
+++ b/themes/wporg-5ftf-2024/templates/single-5ftf_pledge.html
@@ -1,11 +1,15 @@
 <!-- wp:template-part {"slug":"header","className":"has-display-contents"} /-->
 
-<!-- wp:group {"tagName":"article","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"},"margin":{"bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
-<article class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+<!-- wp:group {"tagName":"article","style":{"spacing":{"padding":{"right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}},"layout":{"type":"constrained"}} -->
+<article class="wp-block-group" style="padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
 	
 	<!-- wp:pattern {"slug":"wporg-5ftf-2024/single-5ftf-pledge"} /-->
 
 </article>
 <!-- /wp:group -->
 
+<!-- wp:spacer {"height":"var:preset|spacing|40","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
+<div style="margin-top:var(--wp--preset--spacing--40);height:0" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
 <!-- wp:template-part {"slug":"footer"} /-->