From 3a8cf7b620fb57663e5b4468c56c47d4762d3c7e Mon Sep 17 00:00:00 2001
From: Juan Aldasoro <juanfraa@gmail.com>
Date: Thu, 19 Sep 2024 15:41:03 +0200
Subject: [PATCH 1/2] Remove duplicate template.

---
 parts/right-aligned-sidebar.html                         | 1 -
 patterns/vertical-header-right-aligned-page-template.php | 2 +-
 patterns/vertical-header-right-aligned-post-template.php | 2 +-
 theme.json                                               | 5 -----
 4 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 parts/right-aligned-sidebar.html

diff --git a/parts/right-aligned-sidebar.html b/parts/right-aligned-sidebar.html
deleted file mode 100644
index a29f8296..00000000
--- a/parts/right-aligned-sidebar.html
+++ /dev/null
@@ -1 +0,0 @@
-<!-- wp:pattern {"slug":"twentytwentyfive/hidden-sidebar"} /-->
diff --git a/patterns/vertical-header-right-aligned-page-template.php b/patterns/vertical-header-right-aligned-page-template.php
index d8ef512a..e1015ffb 100644
--- a/patterns/vertical-header-right-aligned-page-template.php
+++ b/patterns/vertical-header-right-aligned-page-template.php
@@ -55,7 +55,7 @@
 					<!-- /wp:column -->
 					<!-- wp:column {"width":"25%"} -->
 					<div class="wp-block-column" style="flex-basis:25%">
-					<!-- wp:template-part {"slug":"right-aligned-sidebar"} /-->
+					<!-- wp:template-part {"slug":"sidebar"} /-->
 					</div>
 					<!-- /wp:column -->
 				</div>
diff --git a/patterns/vertical-header-right-aligned-post-template.php b/patterns/vertical-header-right-aligned-post-template.php
index 20495595..92c334eb 100644
--- a/patterns/vertical-header-right-aligned-post-template.php
+++ b/patterns/vertical-header-right-aligned-post-template.php
@@ -77,7 +77,7 @@
 					<!-- /wp:column -->
 					<!-- wp:column {"width":"25%"} -->
 					<div class="wp-block-column" style="flex-basis:25%">
-						<!-- wp:template-part {"slug":"right-aligned-sidebar"} /-->
+						<!-- wp:template-part {"slug":"sidebar"} /-->
 					</div>
 					<!-- /wp:column -->
 				</div>
diff --git a/theme.json b/theme.json
index 9ab3cfd2..d6717941 100644
--- a/theme.json
+++ b/theme.json
@@ -1468,11 +1468,6 @@
 			"name": "footer-newsletter",
 			"title": "Footer Newsletter"
 		},
-		{
-			"area": "uncategorized",
-			"name": "right-aligned-sidebar",
-			"title": "Right Aligned Sidebar"
-		},
 		{
 			"area": "uncategorized",
 			"name": "sidebar",

From 32265dbceb2b9da3107fb403173df330272b5164 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <hi@themesbycarolina.com>
Date: Sat, 21 Sep 2024 07:06:10 +0200
Subject: [PATCH 2/2] Create the vertical header template part and adjust
 headings

Create the vertical header template part, and use it in the templates for the design with the vertical header and right aligned blog.
Ensure the design has a single H1 heading.
---
 parts/vertical-header.html                    |  1 +
 ...-header-right-aligned-archive-template.php | 15 +---------
 ...cal-header-right-aligned-home-template.php | 19 ++++---------
 ...cal-header-right-aligned-page-template.php | 13 ++-------
 ...cal-header-right-aligned-post-template.php | 13 ++-------
 ...-right-aligned-search-results-template.php | 16 +----------
 patterns/vertical-header.php                  | 28 +++++++++++++++++++
 theme.json                                    |  5 ++++
 8 files changed, 45 insertions(+), 65 deletions(-)
 create mode 100644 parts/vertical-header.html
 create mode 100644 patterns/vertical-header.php

diff --git a/parts/vertical-header.html b/parts/vertical-header.html
new file mode 100644
index 00000000..e102cc73
--- /dev/null
+++ b/parts/vertical-header.html
@@ -0,0 +1 @@
+<!-- wp:pattern {"slug":"twentytwentyfive/vertical-header"} /-->
diff --git a/patterns/vertical-header-right-aligned-archive-template.php b/patterns/vertical-header-right-aligned-archive-template.php
index 33b00253..e538ddaf 100644
--- a/patterns/vertical-header-right-aligned-archive-template.php
+++ b/patterns/vertical-header-right-aligned-archive-template.php
@@ -16,20 +16,7 @@
 <div class="wp-block-columns is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 	<!-- wp:column {"width":"8rem"} -->
 	<div class="wp-block-column" style="flex-basis:8rem">
-		<!-- wp:group {"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
-			<!-- wp:group {"align":"wide","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
-			<div class="wp-block-group alignwide" style="min-height:100vh;padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)">
-				<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-				<div class="wp-block-group alignfull">
-					<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
-					<!-- wp:site-title {"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
-				</div>
-				<!-- /wp:group -->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<!-- wp:template-part {"slug":"vertical-header","area":"header"} /-->
 	</div>
 	<!-- /wp:column -->
 
diff --git a/patterns/vertical-header-right-aligned-home-template.php b/patterns/vertical-header-right-aligned-home-template.php
index ddcacc93..37b17911 100644
--- a/patterns/vertical-header-right-aligned-home-template.php
+++ b/patterns/vertical-header-right-aligned-home-template.php
@@ -16,20 +16,7 @@
 <div class="wp-block-columns is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 	<!-- wp:column {"width":"8rem"} -->
 	<div class="wp-block-column" style="flex-basis:8rem">
-		<!-- wp:group {"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
-			<!-- wp:group {"align":"wide","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
-			<div class="wp-block-group alignwide" style="min-height:100vh;padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)">
-				<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-				<div class="wp-block-group alignfull">
-					<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
-					<!-- wp:site-title {"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
-				</div>
-				<!-- /wp:group -->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<!-- wp:template-part {"slug":"vertical-header","area":"header"} /-->
 	</div>
 	<!-- /wp:column -->
 
@@ -40,6 +27,10 @@
 			<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
 			<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
 			<!-- /wp:spacer -->
+			<!-- wp:pattern {"slug":"twentytwentyfive/hidden-blog-heading"} /-->
+			<!-- wp:spacer {"height":"var:preset|spacing|50"} -->
+			<div style="height:var(--wp--preset--spacing--50)" aria-hidden="true" class="wp-block-spacer"></div>
+			<!-- /wp:spacer -->
 
 			<!-- wp:pattern {"slug":"twentytwentyfive/right-aligned-posts"} /-->
 
diff --git a/patterns/vertical-header-right-aligned-page-template.php b/patterns/vertical-header-right-aligned-page-template.php
index d8ef512a..c9c6fa7b 100644
--- a/patterns/vertical-header-right-aligned-page-template.php
+++ b/patterns/vertical-header-right-aligned-page-template.php
@@ -15,16 +15,7 @@
 <div class="wp-block-columns is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 	<!-- wp:column {"width":"8rem"} -->
 	<div class="wp-block-column" style="flex-basis:8rem">
-		<!-- wp:group {"metadata":{"name":"Header"},"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
-			<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-			<div class="wp-block-group alignfull">
-				<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
-				<!-- wp:site-title {"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<!-- wp:template-part {"slug":"vertical-header","area":"header"} /-->
 	</div>
 	<!-- /wp:column -->
 	<!-- wp:column {"width":"90%","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|50","left":"0","right":"0"}}},"layout":{"type":"default"}} -->
@@ -39,7 +30,7 @@
 				<!-- /wp:spacer -->
 				<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 				<div class="wp-block-group">
-					<!-- wp:post-title {"style":{"layout":{"selfStretch":"fixed","flexSize":"70vw"}},"fontSize":"xx-large"} /-->
+					<!-- wp:post-title {"level":1,"style":{"layout":{"selfStretch":"fixed","flexSize":"70vw"}},"fontSize":"xx-large"} /-->
 				</div>
 				<!-- /wp:group -->
 				<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
diff --git a/patterns/vertical-header-right-aligned-post-template.php b/patterns/vertical-header-right-aligned-post-template.php
index 59cf880b..e557d90f 100644
--- a/patterns/vertical-header-right-aligned-post-template.php
+++ b/patterns/vertical-header-right-aligned-post-template.php
@@ -16,16 +16,7 @@
 <div class="wp-block-columns is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 	<!-- wp:column {"width":"8rem"} -->
 	<div class="wp-block-column" style="flex-basis:8rem">
-		<!-- wp:group {"metadata":{"name":"Header"},"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
-			<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-			<div class="wp-block-group alignfull">
-				<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
-				<!-- wp:site-title {"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<!-- wp:template-part {"slug":"vertical-header","area":"header"} /-->
 	</div>
 	<!-- /wp:column -->
 	<!-- wp:column {"width":"90%","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"0"}}},"layout":{"type":"default"}} -->
@@ -39,7 +30,7 @@
 				<!-- /wp:spacer -->
 				<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between","verticalAlignment":"top"}} -->
 				<div class="wp-block-group">
-					<!-- wp:post-title {"style":{"layout":{"selfStretch":"fixed","flexSize":"70vw"}},"fontSize":"xx-large"} /-->
+					<!-- wp:post-title {"level":1,"style":{"layout":{"selfStretch":"fixed","flexSize":"70vw"}},"fontSize":"xx-large"} /-->
 					<!-- wp:post-date {"textAlign":"right","style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"textColor":"contrast","fontSize":"small"} /-->
 					</div>
 				<!-- /wp:group -->
diff --git a/patterns/vertical-header-right-aligned-search-results-template.php b/patterns/vertical-header-right-aligned-search-results-template.php
index e6378308..a9246586 100644
--- a/patterns/vertical-header-right-aligned-search-results-template.php
+++ b/patterns/vertical-header-right-aligned-search-results-template.php
@@ -16,23 +16,9 @@
 <div class="wp-block-columns is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
 	<!-- wp:column {"width":"8rem"} -->
 	<div class="wp-block-column" style="flex-basis:8rem">
-		<!-- wp:group {"metadata":{"name":"Header"},"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
-		<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
-			<!-- wp:group {"align":"wide","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
-			<div class="wp-block-group alignwide" style="min-height:100vh;padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)">
-				<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-				<div class="wp-block-group alignfull">
-					<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
-					<!-- wp:site-title {"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
-				</div>
-				<!-- /wp:group -->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<!-- wp:template-part {"slug":"vertical-header","area":"header"} /-->
 	</div>
 	<!-- /wp:column -->
-
 	<!-- wp:column {"width":"90%","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50","right":"var:preset|spacing|50"}}},"layout":{"type":"default"}} -->
 	<div class="wp-block-column" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50);flex-basis:90%">
 		<!-- wp:group {"tagName":"main","layout":{"type":"default"}} -->
diff --git a/patterns/vertical-header.php b/patterns/vertical-header.php
new file mode 100644
index 00000000..909907b8
--- /dev/null
+++ b/patterns/vertical-header.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Title: Vertical Header
+ * Slug: twentytwentyfive/vertical-header
+ * Categories: header
+ * Block Types: core/template-part/vertical-header
+ * Description: Vertical Header with site title and navigation
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twenty_Five
+ * @since Twenty Twenty-Five 1.0
+ */
+
+?>
+<!-- wp:group {"align":"wide","style":{"position":{"type":"sticky","top":"0px"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|30","right":"var:preset|spacing|30"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--30)">
+	<!-- wp:group {"align":"wide","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"right":"var:preset|spacing|30","left":"var:preset|spacing|30"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
+	<div class="wp-block-group alignwide" style="min-height:100vh;padding-right:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--30)">
+		<!-- wp:group {"align":"full","layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
+		<div class="wp-block-group alignfull">
+			<!-- wp:navigation {"overlayMenu":"always","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|20"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"}} /-->
+			<!-- wp:site-title {"level":0,"style":{"typography":{"writingMode":"vertical-rl"}},"fontSize":"large"} /-->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->
+</div>
+<!-- /wp:group -->
diff --git a/theme.json b/theme.json
index 8a703b64..9e345e94 100644
--- a/theme.json
+++ b/theme.json
@@ -1463,6 +1463,11 @@
 			"name": "header",
 			"title": "Header"
 		},
+		{
+			"area": "header",
+			"name": "vertical-header",
+			"title": "Vertical Header"
+		},
 		{
 			"area": "footer",
 			"name": "footer",