Twenty Twenty-Three: Sync the latest fixes for RC2.

For a full list of changes included, see the `twentytwentythree` repository on GitHub: WordPress/twentytwentythree@4ea5d83...0f273d7. Props mikachan, beafialho, kafleg, richtabor, poena, annezazu. Fixes #56383. git-svn-id: https://develop.svn.wordpress.org/trunk@54629 602fd350-edb4-49c9-b593-d223f7449a82
ootwch · Nov 4, 2022 · 896ba18 · 896ba18
1 parent c5a0b2d
commit 896ba18
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 106 deletions.
diff --git a/src/wp-content/themes/twentytwentythree/parts/header.html b/src/wp-content/themes/twentytwentythree/parts/header.html
@@ -1,7 +1,7 @@
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
-	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|60"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-	<div class="wp-block-group alignwide" style="padding-bottom:var(--wp--preset--spacing--60)">
+	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	<div class="wp-block-group alignwide" style="padding-bottom:var(--wp--preset--spacing--40)">
 		<!-- wp:site-title {"level":0} /-->
 		<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right"}} /-->
 	</div>

diff --git a/src/wp-content/themes/twentytwentythree/patterns/hidden-404.php b/src/wp-content/themes/twentytwentythree/patterns/hidden-404.php
@@ -5,20 +5,24 @@
  * Inserter: no
  */
 ?>
-<!-- wp:heading {"level":1,"className":"has-text-align-center"} -->
-<h1 class="has-text-align-center">
-	<?php echo esc_html_x( '404', 'Error code for a webpage that is not found.', 'twentytwentythree' ); ?>
-</h1>
+<!-- wp:spacer {"height":"var(--wp--preset--spacing--30)"} -->
+<div style="height:var(--wp--preset--spacing--30)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:heading {"level":1,"align":"wide"} -->
+<h1 class="alignwide"><?php echo esc_html_x( '404', 'Error code for a webpage that is not found.', 'twentytwentythree' ); ?></h1>
 <!-- /wp:heading -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">
-	<?php echo esc_html_x( 'This page could not be found.', 'Message to convey that a webpage could not be found', 'twentytwentythree' ); ?>
-</p>
-<!-- /wp:paragraph -->
+<!-- wp:group {"align":"wide","layout":{"type":"default"},"style":{"spacing":{"margin":{"top":"5px"}}}} -->
+<div class="wp-block-group alignwide" style="margin-top:5px">
+	<!-- wp:paragraph -->
+	<p><?php echo esc_html_x( 'This page could not be found.', 'Message to convey that a webpage could not be found', 'twentytwentythree' ); ?></p>
+	<!-- /wp:paragraph -->
 
-<!-- wp:spacer {"height":"var(--wp--preset--spacing--40)"} -->
-<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
+	<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'label', 'twentytwentythree' ); ?>","placeholder":"<?php echo esc_attr_x( 'Search...', 'placeholder for search field', 'twentytwentythree' ); ?>","showLabel":false,"width":100,"widthUnit":"%","buttonText":"<?php esc_attr_e( 'Search', 'twentytwentythree' ); ?>","buttonUseIcon":true,"align":"center"} /-->
+</div>
+<!-- /wp:group -->
 
-<!-- wp:search {"label":"<?php echo esc_html_x( 'Search', 'label', 'twentytwentythree' ); ?>","placeholder":"<?php echo esc_attr_x( 'Search...', 'placeholder for search field', 'twentytwentythree' ); ?>","showLabel":false,"width":100,"widthUnit":"%","buttonText":"<?php esc_attr_e( 'Search', 'twentytwentythree' ); ?>","buttonUseIcon":true,"align":"center"} /-->
+<!-- wp:spacer {"height":"var(--wp--preset--spacing--70)"} -->
+<div style="height:var(--wp--preset--spacing--70)" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
diff --git a/src/wp-content/themes/twentytwentythree/patterns/post-meta.php b/src/wp-content/themes/twentytwentythree/patterns/post-meta.php
@@ -11,14 +11,14 @@
 <div style="height:0" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70)">
 	<!-- wp:separator {"opacity":"css","align":"wide","className":"is-style-wide"} -->
 	<hr class="wp-block-separator alignwide has-css-opacity is-style-wide"/>
 	<!-- /wp:separator -->
 
-	<!-- wp:columns {"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|40"},"blockGap":"var:preset|spacing|70"}},"fontSize":"small"} -->
-	<div class="wp-block-columns alignwide has-small-font-size" style="margin-top:var(--wp--preset--spacing--40)">
+	<!-- wp:columns {"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|30"},"blockGap":"var:preset|spacing|30"}},"fontSize":"small"} -->
+	<div class="wp-block-columns alignwide has-small-font-size" style="margin-top:var(--wp--preset--spacing--30)">
 		<!-- wp:column {"style":{"spacing":{"blockGap":"0px"}}} -->
 		<div class="wp-block-column">
 			<!-- wp:group {"style":{"spacing":{"blockGap":"0.5ch"}},"layout":{"type":"flex"}} -->

diff --git a/src/wp-content/themes/twentytwentythree/style.css b/src/wp-content/themes/twentytwentythree/style.css
@@ -11,5 +11,5 @@ Version: 1.0
 License: GNU General Public License v2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 Text Domain: twentytwentythree
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, accessibility-ready
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, translation-ready, wide-blocks, accessibility-ready, blog, portfolio, news
 */
diff --git a/src/wp-content/themes/twentytwentythree/styles/aubergine.json b/src/wp-content/themes/twentytwentythree/styles/aubergine.json
@@ -191,13 +191,6 @@
 					}
 				}
 			},
-			"core/query-pagination": {
-				"border": {
-					"top": {
-						"color": "var(--wp--preset--color--primary)"
-					}
-				}
-			},
 			"core/separator": {
 				"color": {
 					"text": "var(--wp--preset--color--primary)"

diff --git a/src/wp-content/themes/twentytwentythree/styles/canary.json b/src/wp-content/themes/twentytwentythree/styles/canary.json
@@ -52,19 +52,19 @@
 					"slug": "small"
 				},
 				{
-					"size": "0.75rem",
+					"size": "1.125rem",
 					"slug": "medium"
 				},
 				{
-					"size": "0.75rem",
+					"size": "1.75rem",
 					"slug": "large"
 				},
 				{
-					"size": "0.75rem",
+					"size": "2.25rem",
 					"slug": "x-large"
 				},
 				{
-					"size": "0.75rem",
+					"size": "10rem",
 					"slug": "xx-large"
 				}
 			]
@@ -91,9 +91,9 @@
 					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
-			"core/heading": {
+			"core/comments-title":{
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--ibm-plex-mono)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"core/image": {
@@ -123,6 +123,11 @@
 					}
 				}
 			},
+			"core/post-excerpt": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)"
+				}
+			},
 			"core/post-featured-image": {
 				"border": {
 					"radius": "100px 0 0 0"
@@ -147,13 +152,6 @@
 					"fontWeight": "700"
 				}
 			},
-			"core/query-pagination": {
-				"border": {
-					"top": {
-						"width": "4px"
-					}
-				}
-			},
 			"core/separator": {
 				"border": {
 					"width": "2px"
@@ -162,7 +160,8 @@
 			"core/site-title": {
 				"typography": {
 					"fontWeight": "700",
-					"textTransform": "lowercase"
+					"textTransform": "lowercase",
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			}
 		},
@@ -210,22 +209,22 @@
 			},
 			"h1": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"h2": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				}
 			},
 			"heading": {
@@ -240,7 +239,8 @@
 			}
 		},
 		"typography": {
-			"fontFamily": "var(--wp--preset--font-family--ibm-plex-mono)"
+			"fontFamily": "var(--wp--preset--font-family--ibm-plex-mono)",
+			"fontSize": "var(--wp--preset--font-size--small)"
 		}
 	}
 }
diff --git a/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json b/src/wp-content/themes/twentytwentythree/styles/pilgrimage.json
@@ -206,11 +206,6 @@
 							"textDecoration": "underline"
 						}
 					}
-				},
-				"border": {
-					"top": {
-						"color": "var(--wp--preset--color--primary)"
-					}
 				}
 			},
 			"core/separator": {

diff --git a/src/wp-content/themes/twentytwentythree/styles/pitch.json b/src/wp-content/themes/twentytwentythree/styles/pitch.json
@@ -130,14 +130,6 @@
 	},
 	"styles": {
 		"blocks": {
-			"core/query-pagination": {
-				"border": {
-					"top": {
-						"color": "var(--wp--preset--color--tertiary)",
-						"width": "4px"
-					}
-				}
-			},
 			"core/separator": {
 				"border": {
 					"color":"var(--wp--preset--color--tertiary)",

diff --git a/src/wp-content/themes/twentytwentythree/styles/whisper.json b/src/wp-content/themes/twentytwentythree/styles/whisper.json
@@ -222,13 +222,6 @@
 				}
 			},
 			"core/query-pagination": {
-				"border": {
-					"top": {
-						"color": "var(--wp--preset--color--contrast)",
-						"style": "double",
-						"width": "6px"
-					}
-				},
 				"elements": {
 					"link": {
 						":hover": {

diff --git a/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html b/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html
@@ -5,8 +5,8 @@
 	<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-query alignwide">
 		<!-- wp:post-template -->
-			<!-- wp:columns {"verticalAlignment":null,"style":{"border":{"bottom":{"width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}}} -->
-			<div class="wp-block-columns" style="border-bottom-width:1px;padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50)">
+			<!-- wp:columns {"style":{"border":{"bottom":{"width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"margin":{"top":"-1.5rem","bottom":"0px"}}}} -->
+			<div class="wp-block-columns" style="border-bottom-width:1px;margin-top:-1.5rem;margin-bottom:0px;padding-top:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40)">
 				<!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
 				<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%">
 					<!-- wp:post-date {"textAlign":"left"} /-->

diff --git a/src/wp-content/themes/twentytwentythree/templates/home.html b/src/wp-content/themes/twentytwentythree/templates/home.html
@@ -1,9 +1,9 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
-<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
-	<!-- wp:heading {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|50"}}}} -->
-	<h1 class="alignwide" style="margin-top:var(--wp--preset--spacing--60);margin-bottom:var(--wp--preset--spacing--50)">Mindblown: a blog about philosophy.</h1>
+<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
+<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50);margin-bottom:var(--wp--preset--spacing--70)">
+	<!-- wp:heading {"level":1,"align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|60"}}}} -->
+	<h1 class="alignwide" style="margin-bottom:var(--wp--preset--spacing--60)">Mindblown: a blog about philosophy.</h1>
 	<!-- /wp:heading -->
 
 	<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"constrained"}} -->
@@ -14,8 +14,8 @@ <h1 class="alignwide" style="margin-top:var(--wp--preset--spacing--60);margin-bo
 			<!-- wp:post-excerpt /-->
 			<!-- wp:post-date {"isLink":true} /-->
 
-			<!-- wp:spacer {"height":"var(--wp--preset--spacing--60)"} -->
-			<div style="height:var(--wp--preset--spacing--60)" aria-hidden="true" class="wp-block-spacer"></div>
+			<!-- wp:spacer {"height":"var(--wp--preset--spacing--40)"} -->
+			<div style="height:var(--wp--preset--spacing--40)" aria-hidden="true" class="wp-block-spacer"></div>
 			<!-- /wp:spacer -->
 		<!-- /wp:post-template -->
 

diff --git a/src/wp-content/themes/twentytwentythree/templates/page.html b/src/wp-content/themes/twentytwentythree/templates/page.html
@@ -1,11 +1,11 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
+<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|50"}}}} -->
+<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50)">
 	<!-- wp:group {"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group">
-		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide"} /-->
-		<!-- wp:post-title {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
+		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|50","top":"calc(-1 * var(--wp--preset--spacing--50))"}}}} /-->
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} /-->
 	</div>
 	<!-- /wp:group -->
 

diff --git a/src/wp-content/themes/twentytwentythree/templates/single.html b/src/wp-content/themes/twentytwentythree/templates/single.html
@@ -1,11 +1,11 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
+<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"var:preset|spacing|50"}}}} -->
+<main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50)">
 	<!-- wp:group {"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group">
-		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide"} /-->
-		<!-- wp:post-title {"level":1,"align":"wide","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
+		<!-- wp:post-featured-image {"overlayColor":"contrast","dimRatio":50,"align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|50","top":"calc(-1 * var(--wp--preset--spacing--50))"}}}} /-->
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} /-->
 	</div>
 	<!-- /wp:group -->