From 32d31596fab0bb10e5bbc732dd3ed2fdbe0a9fc6 Mon Sep 17 00:00:00 2001
From: Sarah Norris <1645628+mikachan@users.noreply.github.com>
Date: Mon, 31 Jul 2023 10:58:47 +0100
Subject: [PATCH] Rainfall & Adventurer: Update sidebar tag to `aside` (#7284)

* Rainfall: use aside tag for sidebar

* Adventurer: use aside tag for sidebar
---
 adventurer/patterns/sidebar.php | 92 ++++++++++++++++-----------------
 rainfall/patterns/sidebar.php   |  6 ++-
 2 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/adventurer/patterns/sidebar.php b/adventurer/patterns/sidebar.php
index b5d43a7639..e9d93ae638 100644
--- a/adventurer/patterns/sidebar.php
+++ b/adventurer/patterns/sidebar.php
@@ -7,50 +7,50 @@
 
 ?>
 
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
-    <!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"tertiary","layout":{"type":"constrained"}} -->
-    <div class="wp-block-group has-tertiary-background-color has-background" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)">
-        <!-- wp:paragraph {"style":{"typography":{"letterSpacing":"1px","fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","fontSize":"0.8rem"}}} -->
-        <p style="font-size:0.8rem;font-style:normal;font-weight:500;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest Stories', 'adventurer' ); ?></p>
-        <!-- /wp:paragraph -->
-
-        <!-- wp:query {"queryId":24,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"type":"default"}} -->
-        <div class="wp-block-query">
-            <!-- wp:post-template -->
-            <!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
-            <div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-                <!-- wp:post-featured-image {"isLink":true,"width":"","height":"160px","align":"wide","style":{"border":{"radius":"0px","top":{"radius":"0px","width":"0px","style":"none"},"right":{"color":"#f5f2eb00","width":"0px","style":"none"},"bottom":{"radius":"0px","width":"0px","style":"none"},"left":{"radius":"0px","width":"0px","style":"none"}},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} /-->
-
-                <!-- wp:post-title {"isLink":true,"fontSize":"medium"} /-->
-
-                <!-- wp:post-date {"displayType":"modified","style":{"typography":{"fontSize":"0.6rem","textTransform":"uppercase","letterSpacing":"0.05em","fontStyle":"normal","fontWeight":"500"}}} /-->
-
-                <!-- wp:spacer {"height":"10px"} -->
-                <div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
-                <!-- /wp:spacer -->
-            </div>
-            <!-- /wp:group -->
-            <!-- /wp:post-template -->
-        </div>
-        <!-- /wp:query -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained","contentSize":"1100px"}} -->
-    <div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)">
-        <!-- wp:heading {"level":3,"style":{"typography":{"textTransform":"uppercase","fontSize":"0.8rem","letterSpacing":"1px"}},"fontFamily":"roboto"} -->
-        <h3 class="wp-block-heading has-roboto-font-family" style="font-size:0.8rem;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest trips', 'adventurer' ); ?></h3>
-        <!-- /wp:heading -->
-
-        <!-- wp:heading {"style":{"typography":{"lineHeight":1.1,"textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"large"} -->
-        <h2 class="wp-block-heading has-large-font-size" id="botswana-new-zealand-south-korea-japan-madagascar" style="font-style:normal;font-weight:900;line-height:1.1;text-transform:uppercase"><a href=""><?php echo esc_html__( 'ITALY', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'COSTA RICA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'CANADA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'LAOS', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'TURKEY', 'adventurer' ); ?></a></h2>
-        <!-- /wp:heading -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:spacer {"height":"170px"} -->
-    <div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-</div>
+<!-- wp:group {"tagName":"aside","align":"full","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
+<aside class="wp-block-group alignfull">
+	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"tertiary","layout":{"type":"constrained"}} -->
+	<div class="wp-block-group has-tertiary-background-color has-background" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)">
+		<!-- wp:paragraph {"style":{"typography":{"letterSpacing":"1px","fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","fontSize":"0.8rem"}}} -->
+		<p style="font-size:0.8rem;font-style:normal;font-weight:500;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest Stories', 'adventurer' ); ?></p>
+		<!-- /wp:paragraph -->
+
+		<!-- wp:query {"queryId":24,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"type":"default"}} -->
+		<div class="wp-block-query">
+			<!-- wp:post-template -->
+			<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
+			<div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+				<!-- wp:post-featured-image {"isLink":true,"width":"","height":"160px","align":"wide","style":{"border":{"radius":"0px","top":{"radius":"0px","width":"0px","style":"none"},"right":{"color":"#f5f2eb00","width":"0px","style":"none"},"bottom":{"radius":"0px","width":"0px","style":"none"},"left":{"radius":"0px","width":"0px","style":"none"}},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} /-->
+
+				<!-- wp:post-title {"isLink":true,"fontSize":"medium"} /-->
+
+				<!-- wp:post-date {"displayType":"modified","style":{"typography":{"fontSize":"0.6rem","textTransform":"uppercase","letterSpacing":"0.05em","fontStyle":"normal","fontWeight":"500"}}} /-->
+
+				<!-- wp:spacer {"height":"10px"} -->
+				<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+			</div>
+			<!-- /wp:group -->
+			<!-- /wp:post-template -->
+		</div>
+		<!-- /wp:query -->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained","contentSize":"1100px"}} -->
+	<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--60)">
+		<!-- wp:heading {"level":3,"style":{"typography":{"textTransform":"uppercase","fontSize":"0.8rem","letterSpacing":"1px"}},"fontFamily":"roboto"} -->
+		<h3 class="wp-block-heading has-roboto-font-family" style="font-size:0.8rem;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest trips', 'adventurer' ); ?></h3>
+		<!-- /wp:heading -->
+
+		<!-- wp:heading {"style":{"typography":{"lineHeight":1.1,"textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"large"} -->
+		<h2 class="wp-block-heading has-large-font-size" id="botswana-new-zealand-south-korea-japan-madagascar" style="font-style:normal;font-weight:900;line-height:1.1;text-transform:uppercase"><a href=""><?php echo esc_html__( 'ITALY', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'COSTA RICA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'CANADA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'LAOS', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'TURKEY', 'adventurer' ); ?></a></h2>
+		<!-- /wp:heading -->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:spacer {"height":"170px"} -->
+	<div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+</aside>
 <!-- /wp:group -->
diff --git a/rainfall/patterns/sidebar.php b/rainfall/patterns/sidebar.php
index c891af6a72..c7e18ad0eb 100644
--- a/rainfall/patterns/sidebar.php
+++ b/rainfall/patterns/sidebar.php
@@ -5,7 +5,8 @@
  * Categories: columns
  */
 ?>
-<!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|20"}}}} -->
+<!-- wp:group {"tagName":"aside","layout":{"type":"constrained"}} -->
+<aside class="wp-block-group"><!-- wp:heading {"level":6,"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|20"}}}} -->
 <h6 style="margin-top:0;margin-bottom:var(--wp--preset--spacing--20)"><?php echo esc_html__( 'Search for a Topic', 'rainfall' ); ?></h6>
 <!-- /wp:heading -->
 
@@ -29,4 +30,5 @@
 
 <!-- wp:paragraph -->
 <p><?php echo esc_html__( 'Would you like to contribute as an editor or a writer to our blog? Let us know all the details about yourself and send us a message.', 'rainfall' ); ?></p>
-<!-- /wp:paragraph -->
+<!-- /wp:paragraph --></aside>
+<!-- /wp:group -->