Try/type rebased

patterns/banner-about-book.php

@@ -18,8 +18,8 @@
 	<div class="wp-block-columns alignwide">
 		<!-- wp:column {"verticalAlignment":"center","width":""} -->
 		<div class="wp-block-column is-vertically-aligned-center">
-			<!-- wp:heading {"level":3,"className":"wp-block-heading","fontSize":"x-large"} -->
-			<h3 class="wp-block-heading has-x-large-font-size">About the book</h3>
+			<!-- wp:heading {"level":3,"className":"wp-block-heading","fontSize":"xx-large"} -->
+			<h3 class="wp-block-heading has-xx-large-font-size">About the book</h3>
 			<!-- /wp:heading -->
 
 			<!-- wp:paragraph {"fontSize":"medium"} -->

patterns/banner-intro-image.php

@@ -31,8 +31,8 @@
 			<h2 class="wp-block-heading"><?php echo esc_html_x( 'New arrivals', 'Heading for banner with flower', 'twentytwentyfive' ); ?></h2>
 			<!-- /wp:heading -->
 
-			<!-- wp:paragraph {"fontSize":"large"} -->
-			<p class="has-large-font-size"><?php echo esc_html_x( 'Like flowers that bloom in unexpected places, every story unfolds with beauty and resilience, revealing hidden wonders.', 'Sample description for banner with flower', 'twentytwentyfive' ); ?></p>
+			<!-- wp:paragraph -->
+			<p><?php echo esc_html_x( 'Like flowers that bloom in unexpected places, every story unfolds with beauty and resilience, revealing hidden wonders.', 'Sample description for banner with flower', 'twentytwentyfive' ); ?></p>
 			<!-- /wp:paragraph -->
 
 			<!-- wp:buttons -->

patterns/banner-with-description-and-images-grid.php

@@ -19,13 +19,14 @@
 		<div class="wp-block-group">
 			<!-- wp:group {"layout":{"type":"flex","orientation":"vertical","justifyContent":"left"}} -->
 			<div class="wp-block-group">
-				<!-- wp:heading {"className":"is-style-pill"} -->
-				<h2 class="wp-block-heading is-style-pill">About Us</h2>
+				<!-- wp:heading {"className":"is-style-text-annotation"} -->
+				<h2 class="wp-block-heading is-style-text-annotation"><?php esc_html_e( 'About Us', 'twentytwentyfive' ); ?></h2>
 				<!-- /wp:heading -->
 
-				<!-- wp:paragraph -->
-				<p><strong>Fleurs</strong> is a flower delivery and subscription business. Based in the EU, our mission is not only to deliver stunning flower arrangements across but also foster knowledge and enthusiasm on the beautiful gift of nature: flowers.</p>
+				<!-- wp:paragraph {"className":"is-style-text-subtitle"} -->
+				<p class="is-style-text-subtitle"><strong>Fleurs</strong> is a flower delivery and subscription business. Based in the EU, our mission is not only to deliver stunning flower arrangements across but also foster knowledge and enthusiasm on the beautiful gift of nature: flowers.</p>
 				<!-- /wp:paragraph -->
+
 			</div>
 			<!-- /wp:group -->
 

patterns/contact-centered-social-link.php

@@ -2,7 +2,7 @@
 /**
  * Title: Centered link and social links
  * Slug: twentytwentyfive/contact-centered-social-link
- * Keywords: contact, social-link
+ * Keywords: contact, faq, questions
  * Categories: contact
  * Description: Centered contact section with a prominent message and social media links.
  *
@@ -12,15 +12,20 @@
  */
 
 ?>
+
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"},"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80)">
-	<!-- wp:group {"align":"wide","layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
+	<!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-size--huge)"}}} -->
-		<p class="has-text-align-center" style="font-size:var(--wp--custom--font-size--huge);"><?php echo wp_kses_post( _x( 'Got questions? <br><a href="#" rel="nofollow">Feel free to reach out.</a>', 'Heading of the Contact social link pattern', 'twentytwentyfive' ) ); ?></p>
+		<!-- wp:paragraph {"align":"center","className":"is-style-text-display","style":{"typography":{"fontStyle":"normal","fontWeight":"400"}}} -->
+		<p class="has-text-align-center is-style-text-display" style="font-style:normal;font-weight:400"><?php echo wp_kses_post( _x( 'Got questions? <br><a href="#" rel="nofollow">Feel free to reach out.</a>', 'Heading of the Contact social link pattern', 'twentytwentyfive' ) ); ?></p>
 		<!-- /wp:paragraph -->
 
-		<!-- wp:social-links {"iconColor":"contrast","className":"is-style-logos-only","layout":{"type":"flex","justifyContent":"center"}} -->
+		<!-- wp:spacer {"height":"var:preset|spacing|40"} -->
+		<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
+		<!-- /wp:spacer -->
+
+		<!-- wp:social-links {"iconColor":"contrast","className":"has-icon-color is-style-logos-only","layout":{"type":"flex","justifyContent":"center"}} -->
 		<ul class="wp-block-social-links has-icon-color is-style-logos-only">
 			<!-- wp:social-link {"url":"#","service":"twitter"} /-->
 			<!-- wp:social-link {"url":"#","service":"facebook"} /-->

patterns/contact-location-and-link.php

@@ -2,7 +2,7 @@
 /**
  * Title: Contact location and link
  * Slug: twentytwentyfive/contact-location-and-link
- * Categories: banner, featured
+ * Categories: contact, featured
  * Description: Contact section with a location address, a directions link, and an image of the location.
  *
  * @package WordPress
@@ -13,15 +13,14 @@
 ?>
 <!-- wp:group {"align":"full","className":"is-style-section-3","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
 <div class="wp-block-group alignfull is-style-section-3" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
-	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|80"}}}} -->
+	<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|50","left":"var:preset|spacing|50"}}}} -->
 	<div class="wp-block-columns alignwide">
 		<!-- wp:column {"verticalAlignment":"top","width":""} -->
 		<div class="wp-block-column is-vertically-aligned-top">
-			<!-- wp:group {"style":{"dimensions":{"minHeight":"100%"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-			<div class="wp-block-group" style="min-height:100%">
-				<!-- wp:heading {"className":"wp-block-heading"} -->
-				<h2 class="wp-block-heading">Visit us at 123 Example St. Manhattan, NY 10300, United States</h2>
-				<!-- /wp:heading -->
+			<!-- wp:group {"style":{"dimensions":{"minHeight":"100%"},"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+			<div class="wp-block-group" style="min-height:100%"><!-- wp:paragraph {"className":"is-style-text-display","fontSize":"xx-large"} -->
+				<p class="is-style-text-display has-xx-large-font-size">Visit us at 123 Example St. Manhattan, NY 10300, United States</p>
+				<!-- /wp:paragraph -->
 
 				<!-- wp:paragraph {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"medium"} -->
 				<p class="has-medium-font-size" style="text-transform:uppercase"><a href="#">Get directions</a></p>

patterns/cta-book-locations.php

@@ -19,8 +19,8 @@
 		<div class="wp-block-column" style="flex-basis:60%">
 			<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"var:preset|spacing|30"}}},"layout":{"type":"flex","orientation":"vertical","flexWrap":"wrap"}} -->
 			<div class="wp-block-group" style="padding-bottom:var(--wp--preset--spacing--30)">
-				<!-- wp:heading {"fontSize":"x-large"} -->
-				<h2 class="wp-block-heading has-x-large-font-size">International editions</h2>
+				<!-- wp:heading -->
+				<h2 class="wp-block-heading">International editions</h2>
 				<!-- /wp:heading -->
 
 				<!-- wp:paragraph {"fontSize":"medium"} -->

patterns/cta-heading-search.php

@@ -13,8 +13,9 @@
 ?>
 <!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|50","padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignwide" style="padding-top:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80)"><!-- wp:group {"align":"wide","layout":{"type":"default"}} -->
-	<div class="wp-block-group alignwide"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"var(--wp--custom--font-size--huge)"}}} -->
-		<h3 class="wp-block-heading" style="font-size:var(--wp--custom--font-size--huge);"><?php esc_html_e( 'What are you looking for?', 'twentytwentyfive' ); ?></h3>
+	<div class="wp-block-group alignwide">
+		<!-- wp:heading {"fontSize":"xx-large"} -->
+		<h2 class="wp-block-heading has-xx-large-font-size"><?php esc_html_e( 'What are you looking for?', 'twentytwentyfive' ); ?></h2>
 		<!-- /wp:heading -->
 
 		<!-- wp:search {"label":"Search","showLabel":false,"placeholder":"<?php esc_html_e( 'Type here...', 'twentytwentyfive' ); ?>","buttonText":"<?php esc_html_e( 'Search', 'twentytwentyfive' ); ?>"} /-->

patterns/cta-newsletter.php

@@ -11,24 +11,23 @@
  */
 
 ?>
-<!-- wp:cover {"tagName":"aside","overlayColor":"accent-1","isUserOverlayColor":true,"minHeight":460,"isDark":false,"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
-<aside class="wp-block-cover alignfull is-light" 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);min-height:460px"><span aria-hidden="true" class="wp-block-cover__background has-accent-1-background-color has-background-dim-100 has-background-dim"></span>
-<div class="wp-block-cover__inner-container">
-	<!-- wp:heading {"textAlign":"center","fontSize":"x-large"} -->
-	<h2 class="wp-block-heading has-text-align-center has-x-large-font-size"><?php echo esc_html_x( 'Sign up to get daily stories', 'Newsletter pattern sample text', 'twentytwentyfive' ); ?></h2>
+<!-- wp:cover {"overlayColor":"accent-1","isUserOverlayColor":true,"minHeight":460,"isDark":false,"metadata":{"categories":["call-to-action"],"patternName":"twentytwentyfive/newsletter-sign-up","name":"Newsletter Sign Up"},"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained","contentSize":"800px"}} -->
+<div class="wp-block-cover alignfull is-light" 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);min-height:460px"><span aria-hidden="true" class="wp-block-cover__background has-accent-1-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container">
+	<!-- wp:heading {"textAlign":"center","fontSize":"xx-large"} -->
+	<h2 class="wp-block-heading has-text-align-center has-xx-large-font-size">Sign up to get daily stories</h2>
 	<!-- /wp:heading -->
 
-	<!-- wp:paragraph {"align":"center"} -->
-	<p class="has-text-align-center"><?php echo wp_kses_post( _x( 'Get access to a curated collection of moments in time featuring<br>photographs from historical relevance.', 'Newsletter pattern sample text', 'twentytwentyfive' ) ); ?></p>
+	<!-- wp:paragraph {"align":"center","className":"is-style-text-subtitle"} -->
+	<p class="has-text-align-center is-style-text-subtitle">Get access to a curated collection of moments in time featuring photographs from historical relevance.</p>
 	<!-- /wp:paragraph -->
 
+	<!-- wp:spacer {"height":"var:preset|spacing|30"} -->
+	<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+
 	<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"center"}} -->
-	<div class="wp-block-buttons">
-		<!-- wp:button {"textAlign":"center"} -->
-		<div class="wp-block-button"><a class="wp-block-button__link has-text-align-center wp-element-button"><?php echo esc_html_x( 'Subscribe', 'Newsletter pattern sample text', 'twentytwentyfive' ); ?></a></div>
-		<!-- /wp:button -->
-	</div>
-	<!-- /wp:buttons -->
-</div>
-</aside>
+	<div class="wp-block-buttons"><!-- wp:button {"textAlign":"center"} -->
+		<div class="wp-block-button"><a class="wp-block-button__link has-text-align-center wp-element-button">Subscribe</a></div>
+	<!-- /wp:button --></div>
+	<!-- /wp:buttons --></div></div>
 <!-- /wp:cover -->

patterns/footer-columns.php

@@ -20,7 +20,7 @@
 		<div class="wp-block-group alignfull">
 			<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"layout":{"type":"constrained"}} -->
 			<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-				<!-- wp:site-title {"level":2,"style":{"typography":{"fontSize":"var(--wp--custom--font-size--huge)"}}} /-->
+				<!-- wp:site-title {"level":2,"fontSize":"xx-large"} /-->
 				<!-- wp:site-tagline /-->
 			</div>
 			<!-- /wp:group -->

patterns/grid-videos.php

@@ -11,16 +11,16 @@
  */
 
 ?>
-<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"blockGap":"var:preset|spacing|60"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
 	<!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
 	<div class="wp-block-group alignwide">
-		<!-- wp:heading {"textAlign":"left","level":3,"align":"wide","style":{"layout":{"selfStretch":"fit","flexSize":null}}} -->
-		<h3 class="wp-block-heading alignwide has-text-align-left">Explore the episodes</h3>
+		<!-- wp:heading {"textAlign":"left","align":"wide","className":"is-style-text-subtitle","style":{"layout":{"selfStretch":"fit","flexSize":null}},"fontSize":"x-large"} -->
+		<h2 class="wp-block-heading alignwide has-text-align-left is-style-text-subtitle has-x-large-font-size">Explore the episodes</h2>
 		<!-- /wp:heading -->
 
-		<!-- wp:paragraph {"className":"is-style-pill"} -->
-		<p class="is-style-pill">Podcast</p>
+		<!-- wp:paragraph {"className":"is-style-text-annotation"} -->
+		<p class="is-style-text-annotation">Podcast</p>
 		<!-- /wp:paragraph -->
 	</div>
 	<!-- /wp:group -->

patterns/heading-and-paragraph-with-image.php

@@ -20,10 +20,9 @@
 		<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%">
 			<!-- wp:heading {"className":"wp-block-heading"} -->
 			<h2 class="wp-block-heading">
-				<?php esc_html_e( 'About the Event', 'twentytwentyfive' ); ?>
+				<?php esc_html_e( 'About the event', 'twentytwentyfive' ); ?>
 			</h2>
 			<!-- /wp:heading -->
-
 			<!-- wp:paragraph {"fontSize":"medium"} -->
 			<p class="has-medium-font-size"><?php echo esc_html_x( 'Held over a weekend, the event is structured around a series of exhibitions, workshops, and panel discussions. The exhibitions showcase a curated selection of photographs that tell compelling stories from various corners of the globe, each image accompanied by detailed narratives that provide context and deeper insight into the historical significance of the scenes depicted. These photographs are drawn from the archives of renowned photographers, as well as emerging talents, ensuring a blend of both classical and contemporary perspectives.', 'Event Overview Text', 'twentytwentyfive' ); ?></p>
 			<!-- /wp:paragraph -->

patterns/hero-book.php

@@ -14,7 +14,7 @@
 ?>
 <!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull">
-	<!-- wp:columns {"align":"full"} -->
+	<!-- wp:columns {"align":"full","style":{"spacing":{"blockGap":{"left":"0"}}}} -->
 	<div class="wp-block-columns alignfull">
 		<!-- wp:column {"width":"55%"} -->
 		<div class="wp-block-column" style="flex-basis:55%">
@@ -32,26 +32,19 @@
 		</div>
 		<!-- /wp:column -->
 
-		<!-- wp:column {"verticalAlignment":"center"} -->
-		<div class="wp-block-column is-vertically-aligned-center">
-			<!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50","top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"},"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained","contentSize":"515px","justifyContent":"left"}} -->
-			<div class="wp-block-group" 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)">
-				<!-- wp:heading {"level":1,"fontSize":"xx-large"} -->
-				<h1 class="wp-block-heading has-xx-large-font-size"><?php echo esc_html_x( 'The Stories Book', 'Heading of the hero section', 'twentytwentyfive' ); ?></h1>
-				<!-- /wp:heading -->
+<!-- wp:column {"verticalAlignment":"center","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60","right":"var:preset|spacing|60"}}}} -->
+<div class="wp-block-column is-vertically-aligned-center" 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 -->
+<h2 class="wp-block-heading has-xx-large-font-size"><?php echo esc_html_x( 'The Stories Book', 'Heading of the hero section', 'twentytwentyfive' ); ?></h2>
+<!-- /wp:heading -->
 
-				<!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"300"}},"fontSize":"large"} -->
-				<p class="has-large-font-size" style="font-style:normal;font-weight:300"><?php echo esc_html_x( 'A fine collection of moments in time featuring photographs from Louis Fleckenstein, Paul Strand and Asahachi Kōno.', 'Content of the hero section', 'twentytwentyfive' ); ?></p>
-				<!-- /wp:paragraph -->
+<!-- wp:paragraph -->
+<p><?php echo esc_html_x( 'A fine collection of moments in time featuring photographs from Louis Fleckenstein, Paul Strand and Asahachi Kōno.', 'Content of the hero section', 'twentytwentyfive' ); ?></p>
+<!-- /wp:paragraph -->
 
-				<!-- wp:paragraph {"fontSize":"medium"} -->
-				<p class="has-medium-font-size"><?php echo esc_html_x( 'Available for pre-order now.', 'CTA text of the hero section', 'twentytwentyfive' ); ?></p>
-				<!-- /wp:paragraph -->
-			</div>
-			<!-- /wp:group -->
-		</div>
-		<!-- /wp:column -->
-	</div>
-	<!-- /wp:columns -->
-</div>
+<!-- wp:paragraph {"fontSize":"medium"} -->
+<p class="has-medium-font-size"><?php echo esc_html_x( 'Available for pre-order now.', 'CTA text of the hero section', 'twentytwentyfive' ); ?></p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
 <!-- /wp:group -->

patterns/hero-full-width-image.php

@@ -19,8 +19,8 @@
 	<div class="wp-block-cover__inner-container">
 		<!-- wp:group {"align":"wide","layout":{"type":"constrained","justifyContent":"left"}} -->
 		<div class="wp-block-group alignwide">
-			<!-- wp:heading {"textAlign":"left"} -->
-			<h2 class="wp-block-heading has-text-align-left"><?php echo esc_html_x( 'Tell your story', 'Sample hero heading', 'twentytwentyfive' ); ?></h2>
+			<!-- wp:heading {"textAlign":"left","fontSize":"xx-large"} -->
+			<h2 class="wp-block-heading has-text-align-left has-xx-large-font-size"><?php echo esc_html_x( 'Tell your story', 'Sample hero heading', 'twentytwentyfive' ); ?></h2>
 			<!-- /wp:heading -->
 
 			<!-- wp:paragraph -->