Rainfall: general improvements (#6676)

* Indent Rainfall block markup

* Make default and outline buttons the same size

* Update button border to 2px

* Update button border colours to match backgrounds

rainfall/style.css

@@ -60,6 +60,7 @@ Tags: two-columns, custom-colors, custom-menu, custom-logo, editor-style, featur
 .has-black-background-color .wp-block-file .wp-block-file__button,
 .has-black-background-color .wp-block-button__link {
 	background-color: var(--wp--preset--color--white);
+	border-color: var(--wp--preset--color--white);
 	color: var(--wp--preset--color--black);
 }
 
@@ -68,12 +69,14 @@ Tags: two-columns, custom-colors, custom-menu, custom-logo, editor-style, featur
 .has-black-background-color .wp-block-file .wp-block-file__button:focus,
 .has-black-background-color .wp-block-button__link:focus {
 	background-color: var(--wp--preset--color--dark-grey);
+	border-color: var(--wp--preset--color--dark-grey);
 	color: var(--wp--preset--color--white);
 }
 
 .has-black-background-color .wp-block-file .wp-block-file__button:active,
 .has-black-background-color .wp-block-button__link:active {
 	background-color: var(--wp--preset--color--light-grey);
+	border-color: var(--wp--preset--color--light-grey);
 	color: var(--wp--preset--color--black);
 }
 

rainfall/templates/index.html

@@ -1,23 +1,33 @@
 <!-- wp:group {"backgroundColor":"light-orange"} -->
-<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-light-orange-background-color has-background">
+    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
-<div class="wp-block-group alignwide"><!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":"55rem"} -->
-<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:query-title {"type":"archive"} /--></div>
-<!-- /wp:column -->
+    <!-- wp:group {"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group">
+        <!-- wp:group {"align":"wide"} -->
+        <div class="wp-block-group alignwide">
+            <!-- wp:columns -->
+            <div class="wp-block-columns">
+                <!-- wp:column {"width":"55rem"} -->
+                <div class="wp-block-column" style="flex-basis:55rem">
+                    <!-- wp:query-title {"type":"archive"} /-->
+                </div>
+                <!-- /wp:column -->
 
-<!-- wp:column -->
-<div class="wp-block-column"></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
+                <!-- wp:column -->
+                <div class="wp-block-column"></div>
+                <!-- /wp:column -->
+            </div>
+            <!-- /wp:columns -->
+        </div>
+        <!-- /wp:group -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
-<!-- /wp:group --></div>
+        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+        <!-- /wp:spacer -->
+    </div>
+    <!-- /wp:group -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"query"} /-->

rainfall/templates/page-header-black.html

@@ -1,51 +1,67 @@
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white"} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
+    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
     <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group"><!-- wp:group {"align":"full"} -->
-    <div class="wp-block-group alignfull"><!-- wp:columns -->
-    <div class="wp-block-columns"><!-- wp:column {"width":"55rem"} -->
-    <div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
-    <!-- /wp:column -->
+    <div class="wp-block-group">
+        <!-- wp:group {"align":"full"} -->
+        <div class="wp-block-group alignfull">
+            <!-- wp:columns -->
+            <div class="wp-block-columns">
+                <!-- wp:column {"width":"55rem"} -->
+                <div class="wp-block-column" style="flex-basis:55rem">
+                    <!-- wp:post-title {"className":"indented-post-title"} /-->
+                </div>
+                <!-- /wp:column -->
     
-    <!-- wp:column -->
-    <div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
-    <!-- /wp:column --></div>
-    <!-- /wp:columns --></div>
-    <!-- /wp:group -->
+                <!-- wp:column -->
+                <div class="wp-block-column">
+                    <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
+                </div>
+                <!-- /wp:column -->
+            </div>
+            <!-- /wp:columns -->
+        </div>
+        <!-- /wp:group -->
     
-    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer --></div>
-    <!-- /wp:group --></div>
+        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+        <!-- /wp:spacer -->
+    </div>
     <!-- /wp:group -->
-
-
+</div>
+<!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
+    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-<div class="wp-block-columns"><!-- wp:column {"layout":{"type":"default"}} -->
-<div class="wp-block-column">
-    <!-- wp:post-featured-image /-->
-    <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
-
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+    <!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
+    <div class="wp-block-columns">
+        <!-- wp:column {"layout":{"type":"default"}} -->
+        <div class="wp-block-column">
+            <!-- wp:post-featured-image /-->
+            <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
 
-<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:column -->
+            <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+            <div class="wp-block-group">
+                <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+                <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
+            </div>
+            <!-- /wp:group -->
+        </div>
+        <!-- /wp:column -->
 
-<!-- wp:column {"width":"18rem"} -->
-<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:template-part {"slug":"sidebar"} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
+        <!-- wp:column {"width":"18rem"} -->
+        <div class="wp-block-column" style="flex-basis:18rem">
+            <!-- wp:template-part {"slug":"sidebar"} /-->
+        </div>
+        <!-- /wp:column -->
+    </div>
+    <!-- /wp:columns -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

rainfall/templates/page-no-sidebar.html

@@ -1,21 +1,31 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full"} -->
-<div class="wp-block-group alignfull"><!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":"55rem"} -->
-<div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column -->
-<div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
+<div class="wp-block-group">
+    <!-- wp:group {"align":"full"} -->
+    <div class="wp-block-group alignfull">
+        <!-- wp:columns -->
+        <div class="wp-block-columns">
+            <!-- wp:column {"width":"55rem"} -->
+            <div class="wp-block-column" style="flex-basis:55rem">
+                <!-- wp:post-title {"className":"indented-post-title"} /-->
+            </div>
+            <!-- /wp:column -->
+
+            <!-- wp:column -->
+            <div class="wp-block-column">
+                <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
+            </div>
+            <!-- /wp:column -->
+        </div>
+        <!-- /wp:columns -->
+    </div>
+    <!-- /wp:group -->
+
+    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:post-featured-image /-->
@@ -24,12 +34,12 @@
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
-
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-
-<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
-<!-- /wp:group -->
+    <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+    <div class="wp-block-group">
+        <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+        <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
+    </div>
+    <!-- /wp:group -->
 </div>
 <!-- /wp:group -->
 

rainfall/templates/page.html

@@ -1,51 +1,67 @@
 <!-- wp:group {"backgroundColor":"light-orange","layout":{"type":"default"}} -->
-<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-light-orange-background-color has-background">
+    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
     <!-- wp:group {"layout":{"type":"constrained"}} -->
-    <div class="wp-block-group"><!-- wp:group {"align":"full"} -->
-    <div class="wp-block-group alignfull"><!-- wp:columns -->
-    <div class="wp-block-columns"><!-- wp:column {"width":"55rem"} -->
-    <div class="wp-block-column" style="flex-basis:55rem"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
-    <!-- /wp:column -->
+    <div class="wp-block-group">
+        <!-- wp:group {"align":"full"} -->
+        <div class="wp-block-group alignfull">
+            <!-- wp:columns -->
+            <div class="wp-block-columns">
+                <!-- wp:column {"width":"55rem"} -->
+                <div class="wp-block-column" style="flex-basis:55rem">
+                    <!-- wp:post-title {"className":"indented-post-title"} /-->
+                </div>
+                <!-- /wp:column -->
     
-    <!-- wp:column -->
-    <div class="wp-block-column"><!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
-    <!-- /wp:column --></div>
-    <!-- /wp:columns --></div>
-    <!-- /wp:group -->
+                <!-- wp:column -->
+                <div class="wp-block-column">
+                    <!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
+                </div>
+                <!-- /wp:column -->
+            </div>
+            <!-- /wp:columns -->
+        </div>
+        <!-- /wp:group -->
     
-    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer --></div>
-    <!-- /wp:group --></div>
+        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+        <!-- /wp:spacer -->
+    </div>
     <!-- /wp:group -->
-
-
+</div>
+<!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
+    <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+    <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-<div class="wp-block-columns"><!-- wp:column {"layout":{"type":"default"}} -->
-<div class="wp-block-column">
-    <!-- wp:post-featured-image /-->
-    <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
-
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+    <!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
+    <div class="wp-block-columns">
+        <!-- wp:column {"layout":{"type":"default"}} -->
+        <div class="wp-block-column">
+            <!-- wp:post-featured-image /-->
+            <!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
 
-<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:column -->
+            <!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+            <div class="wp-block-group">
+                <!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+                <!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
+            </div>
+            <!-- /wp:group -->
+        </div>
+        <!-- /wp:column -->
 
-<!-- wp:column {"width":"18rem"} -->
-<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:template-part {"slug":"sidebar"} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
+        <!-- wp:column {"width":"18rem"} -->
+        <div class="wp-block-column" style="flex-basis:18rem">
+            <!-- wp:template-part {"slug":"sidebar"} /-->
+        </div>
+        <!-- /wp:column -->
+    </div>
+    <!-- /wp:columns -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

rainfall/templates/search.html

@@ -1,15 +1,21 @@
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white"} -->
-<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+<div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
+    <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
-<div class="wp-block-group alignwide"><!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","backgroundColor":"white","textColor":"black","border":{"width":"1px"},"borderColor":"white"} /--></div>
-<!-- /wp:group -->
+    <!-- wp:group {"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group">
+        <!-- wp:group {"align":"wide"} -->
+        <div class="wp-block-group alignwide">
+            <!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","backgroundColor":"white","textColor":"black","border":{"width":"1px"},"borderColor":"white"} /-->
+        </div>
+        <!-- /wp:group -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
-<div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
-<!-- /wp:group --></div>
+        <!-- wp:spacer {"height":"var(--wp--preset--spacing--20)"} -->
+        <div style="height:var(--wp--preset--spacing--20)" aria-hidden="true" class="wp-block-spacer"></div>
+        <!-- /wp:spacer -->
+    </div>
+    <!-- /wp:group -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"query"} /-->

rainfall/templates/single.html

@@ -1,18 +1,27 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:group {"align":"full"} -->
-<div class="wp-block-group alignfull"><!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":"80%"} -->
-<div class="wp-block-column" style="flex-basis:80%"><!-- wp:post-title {"className":"indented-post-title"} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"20%","verticalAlignment":"bottom"} -->
-<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:20%">
-	<!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
-<!-- /wp:group --></div>
+<div class="wp-block-group">
+	<!-- wp:group {"align":"full"} -->
+	<div class="wp-block-group alignfull">
+		<!-- wp:columns -->
+		<div class="wp-block-columns">
+			<!-- wp:column {"width":"80%"} -->
+			<div class="wp-block-column" style="flex-basis:80%">
+				<!-- wp:post-title {"className":"indented-post-title"} /-->
+			</div>
+			<!-- /wp:column -->
+
+			<!-- wp:column {"width":"20%","verticalAlignment":"bottom"} -->
+			<div class="wp-block-column is-vertically-aligned-bottom" style="flex-basis:20%">
+				<!-- wp:post-date {"textAlign":"right","format":"M j, Y","style":{"typography":{"textTransform":"uppercase"}}} /-->
+			</div>
+			<!-- /wp:column -->
+		</div>
+		<!-- /wp:columns -->
+	</div>
+	<!-- /wp:group -->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
@@ -20,96 +29,114 @@
 <!-- /wp:spacer -->
 
 <!-- wp:post-featured-image {"align":"wide","height":"30rem"} /-->
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
-<div class="wp-block-columns"><!-- wp:column {"layout":{"type":"default"}} -->
-<div class="wp-block-column"><!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
 
 <!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
 <div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"><!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
-
-<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-</div><!-- /wp:column -->
-
-<!-- wp:column {"width":"18rem"} -->
-<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:template-part {"slug":"sidebar"} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
+<!-- wp:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group">
+	<!-- wp:columns {"style":{"spacing":{"blockGap":"9.36rem"}}} -->
+	<div class="wp-block-columns">
+		<!-- wp:column {"layout":{"type":"default"}} -->
+		<div class="wp-block-column">
+			<!-- wp:post-content {"lock":{"move":false,"remove":true}} /-->
+
+			<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
+			<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+			<!-- /wp:spacer -->
+
+			<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+			<div class="wp-block-group">
+				<!-- wp:post-navigation-link {"type":"previous","showTitle":true,"linkLabel":true} /-->
+				<!-- wp:post-navigation-link {"showTitle":true,"linkLabel":true} /-->
+			</div>
+			<!-- /wp:group -->
+
+			<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
+			<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+			<!-- /wp:spacer -->
+
+		</div>
+		<!-- /wp:column -->
+
+		<!-- wp:column {"width":"18rem"} -->
+		<div class="wp-block-column" style="flex-basis:18rem">
+			<!-- wp:template-part {"slug":"sidebar"} /-->
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+</div>
 <!-- /wp:group -->
 
-<!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph -->
-
 <!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}}},"backgroundColor":"black","textColor":"white","layout":{"type":"constrained"}} -->
 <div class="wp-block-group has-white-color has-black-background-color has-text-color has-background has-link-color">
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
-<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns -->
-<div class="wp-block-columns"><!-- wp:column {"width":""} -->
-<div class="wp-block-column"><!-- wp:comments-query-loop -->
-<div class="wp-block-comments-query-loop"><!-- wp:comments-title /-->
-
-<!-- wp:comment-template -->
-<!-- wp:columns {"style":{"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|white","width":"1px"},"left":{"width":"0px","style":"none"}},"spacing":{"margin":{"top":"0px","bottom":"0px"},"padding":{"top":"var(--wp--preset--spacing--90)","bottom":"var(--wp--preset--spacing--90)"}}}} -->
-<div class="wp-block-columns" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--white);border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:comment-author-name {"fontSize":"small"} /-->
-
-<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
-<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"fontSize":"small"} /-->
-
-<!-- wp:comment-edit-link {"fontSize":"small"} /--></div>
-<!-- /wp:group -->
-
-<!-- wp:comment-content /-->
-
-<!-- wp:comment-reply-link {"fontSize":"small"} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns -->
-<!-- /wp:comment-template -->
-
-<!-- wp:comments-pagination -->
-<!-- wp:comments-pagination-previous /-->
-
-<!-- wp:comments-pagination-numbers /-->
-
-<!-- wp:comments-pagination-next /-->
-<!-- /wp:comments-pagination -->
-
-<!-- wp:post-comments-form /--></div>
-<!-- /wp:comments-query-loop --></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"width":"18rem"} -->
-<div class="wp-block-column" style="flex-basis:18rem"><!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns -->
-
-<!-- wp:group -->
-<div class="wp-block-group"></div>
-<!-- /wp:group -->
-
-<!-- wp:columns {"align":"full"} -->
-<div class="wp-block-columns alignfull"><!-- wp:column -->
-<div class="wp-block-column"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
-<!-- /wp:column --></div>
-<!-- /wp:columns --></div>
+	<!-- wp:spacer {"height":"var(--wp--preset--spacing--10)"} -->
+	<div style="height:var(--wp--preset--spacing--10)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+
+	<!-- wp:columns -->
+	<div class="wp-block-columns">
+		<!-- wp:column {"width":""} -->
+		<div class="wp-block-column">
+			<!-- wp:comments-query-loop -->
+			<div class="wp-block-comments-query-loop">
+				<!-- wp:comments-title /-->
+
+				<!-- wp:comment-template -->
+					<!-- wp:columns {"style":{"border":{"top":{"width":"0px","style":"none"},"right":{"width":"0px","style":"none"},"bottom":{"color":"var:preset|color|white","width":"1px"},"left":{"width":"0px","style":"none"}},"spacing":{"margin":{"top":"0px","bottom":"0px"},"padding":{"top":"var(--wp--preset--spacing--90)","bottom":"var(--wp--preset--spacing--90)"}}}} -->
+					<div class="wp-block-columns" style="border-top-style:none;border-top-width:0px;border-right-style:none;border-right-width:0px;border-bottom-color:var(--wp--preset--color--white);border-bottom-width:1px;border-left-style:none;border-left-width:0px;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)">
+						<!-- wp:column -->
+						<div class="wp-block-column">
+							<!-- wp:comment-author-name {"fontSize":"small"} /-->
+
+							<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"flex"}} -->
+							<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px">
+								<!-- wp:comment-date {"fontSize":"small"} /-->
+								<!-- wp:comment-edit-link {"fontSize":"small"} /-->
+							</div>
+							<!-- /wp:group -->
+
+							<!-- wp:comment-content /-->
+							<!-- wp:comment-reply-link {"fontSize":"small"} /-->
+						</div>
+						<!-- /wp:column -->
+					</div>
+					<!-- /wp:columns -->
+				<!-- /wp:comment-template -->
+
+				<!-- wp:comments-pagination -->
+				<!-- wp:comments-pagination-previous /-->
+
+				<!-- wp:comments-pagination-numbers /-->
+
+				<!-- wp:comments-pagination-next /-->
+				<!-- /wp:comments-pagination -->
+
+				<!-- wp:post-comments-form /-->
+			</div>
+			<!-- /wp:comments-query-loop -->
+		</div>
+		<!-- /wp:column -->
+
+		<!-- wp:column {"width":"18rem"} -->
+		<div class="wp-block-column" style="flex-basis:18rem">
+			<!-- wp:paragraph -->
+			<p></p>
+			<!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+
+	<!-- wp:columns {"align":"full"} -->
+	<div class="wp-block-columns alignfull"><!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+		</div>
+		<!-- /wp:column -->
+	</div>
+	<!-- /wp:columns -->
+</div>
 <!-- /wp:group -->

rainfall/theme.json

@@ -307,6 +307,9 @@
 							}
 						},
 						":hover": {
+							"border": {
+								"color": "var(--wp--preset--color--black)"
+							},
 							"color": {
 								"background": "var(--wp--preset--color--black)",
 								"text": "var(--wp--preset--color--orange)"
@@ -350,8 +353,10 @@
 		"elements": {
 			"button": {
 				"border": {
+					"color": "var(--wp--preset--color--black)",
 					"radius": "0",
-					"width": "0"
+					"style": "solid",
+					"width": "2px"
 				},
 				"color": {
 					"background": {
@@ -363,10 +368,10 @@
 				},
 				"spacing": {
 					"padding": {
-						"bottom": "var(--wp--preset--spacing--40)",
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)",
-						"top": "var(--wp--preset--spacing--40)"
+						"bottom": "var(--wp--preset--spacing--40) !important",
+						"left": "var(--wp--preset--spacing--50) !important",
+						"right": "var(--wp--preset--spacing--50) !important",
+						"top": "var(--wp--preset--spacing--40) !important"
 					}
 				},
 				"typography": {
@@ -376,6 +381,9 @@
 					"textTransform": "uppercase"
 				},
 				":hover": {
+					"border": {
+						"color": "var(--wp--preset--color--orange)"
+					},
 					"color": {
 						"background": "var(--wp--preset--color--orange)",
 						"text": "var(--wp--preset--color--black)"