Blockbase: add main tag (skip links) (#3987)

* Add main to wrap post content.

* Use main tag.

* Remove extra main tag around post header.

* Remove layout inherit from post title.

blockbase/block-templates/404.html

@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header","tagName":"header","layout":{"inherit":true}} /-->
 
-<!-- wp:group {"layout":{"inherit":true},"className":"page-content"} -->
-<div class="wp-block-group page-content">
+<!-- wp:group {"layout":{"inherit":true},"className":"page-content","tagName":"main"} -->
+<main class="wp-block-group page-content">
 
 <!-- wp:heading {"level":1,"fontSize":"large"} -->
 <h1 class="has-large-font-size">Oops! That page can’t be found.</h1>
@@ -12,7 +12,7 @@
 <!-- /wp:paragraph -->
 
 <!-- wp:search {"label":"","buttonText":"Search"} /-->
-</div>
+</main>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true}} /-->

blockbase/block-templates/index.html

@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header","tagName":"header","layout":{"inherit":true}} /-->
 
-<!-- wp:query {"className":"page-content","layout":{"inherit":true},"queryId":1,"query":{"perPage":10,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
-<div class="wp-block-query page-content">
+<!-- wp:query {"className":"page-content","tagName":"main","layout":{"inherit":true},"queryId":1,"query":{"perPage":10,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","sticky":""}} -->
+<main class="wp-block-query page-content">
 <!-- wp:query-loop -->
 	<!-- wp:post-title {"isLink":true} /-->
 	<!-- wp:post-featured-image {"isLink":true} /-->
@@ -18,7 +18,7 @@
 	<!-- /wp:query-pagination -->
 	</div>
 	<!-- /wp:group -->
-</div>
+</main>
 <!-- /wp:query -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true}} /-->

blockbase/block-templates/search.html

@@ -1,7 +1,7 @@
 <!-- wp:template-part {"slug":"header","tagName":"header","layout":{"inherit":true}} /-->
 
-<!-- wp:group {"layout":{"inherit":true},"className":"page-content"} -->
-<div class="wp-block-group page-content">
+<!-- wp:group {"layout":{"inherit":true},"className":"page-content","tagName":"main"} -->
+<main class="wp-block-group page-content">
 
 <!-- wp:heading -->
 <h2>Results:</h2>
@@ -18,7 +18,7 @@
 </div>
 <!-- /wp:query -->
 
-</div>
+</main>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true}} /-->

blockbase/block-templates/singular.html

@@ -6,8 +6,12 @@
 </div>
 <!-- /wp:group -->
 
+<!-- wp:group {"tagName":"main"} -->
+<main class="wp-block-group post-content">
 <!-- wp:post-featured-image {"align":"full"} /-->
 
 <!-- wp:post-content {"layout":{"inherit":true}} /-->
+</main>
+<!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true}} /-->