JinJang: Prepare for WP.org submission (#7360)

* JinJang: Prepare for WP.org submission

* Add comments pattern from zip file

* Revert "Add comments pattern from zip file"

This reverts commit feea9a32d15b94dbab4023f759d72c57356edace.

* JinJang: Add comment template part

---------

Co-authored-by: Vicente Canales <vicente.canales@automattic.com>

jinjang/patterns/comments.php → jinjang/parts/comments.html

@@ -1,10 +1,3 @@
-<?php
-/**
- * Title: Comments
- * Slug: jinjang/comments
- * inserter: no
- */
-?>
 <!-- wp:group {"style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained","justifyContent":"center"}} -->
 <div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
 	<!-- wp:comments {"className":"wp-block-comments-query-loop"} -->
@@ -14,7 +7,7 @@
 		<!-- wp:comment-template {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
 			<!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var:preset|spacing|50"}}}} -->
 			<div class="wp-block-group" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)">
-				<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|40"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+				<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
 				<div class="wp-block-group">
 					<!-- wp:avatar {"size":48,"style":{"border":{"radius":"50%"}}} /-->
 

jinjang/patterns/404.php

@@ -7,9 +7,9 @@
 ?>
 
 <!-- wp:heading {"level":1,"anchor":"nothing-found"} -->
-<h1 class="wp-block-heading" id="nothing-found"><?php echo esc_html_x( 'Oops! That page can&rsquo;t be found.', 'jinjang' ); ?></h1>
+<h1 class="wp-block-heading" id="nothing-found"><?php echo esc_html__( 'Oops! That page can&rsquo;t be found.', 'jinjang' ); ?></h1>
 <!-- /wp:heading -->
 
 <!-- wp:paragraph -->
-<p><?php echo esc_html_x( 'It looks like nothing was found at this location. Maybe try a search?', 'jinjang' ); ?></p>
+<p><?php echo esc_html__( 'It looks like nothing was found at this location. Maybe try a search?', 'jinjang' ); ?></p>
 <!-- /wp:paragraph -->

jinjang/readme.txt

@@ -1,7 +1,7 @@
-=== jinjang ===
+=== JinJang ===
 Contributors: Automattic
 Requires at least: 5.8
-Tested up to: 6.1.1
+Tested up to: 6.3
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -17,9 +17,9 @@ JinJang is a blog theme with a split, 50:50 layout like Yan Yang.
 
 == Copyright ==
 
-jinjang WordPress Theme, (C) 2023 Automattic
-jinjang is distributed under the terms of the GNU GPL.
-jinjang is based on Lineup (https://wordpress.com/theme/lineup/), (C) Automattic, [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
+JinJang WordPress Theme, (C) 2023 Automattic
+JinJang is distributed under the terms of the GNU GPL.
+JinJang is based on Lineup (https://wordpress.com/theme/lineup/), (C) Automattic, [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

jinjang/style.css

@@ -1,19 +1,21 @@
 /*
-Theme Name: jinjang
+Theme Name: JinJang
 Theme URI: https://wordpress.com/theme/jinjang/
 Author: Automattic
 Author URI: https://automattic.com/
 Description: JinJang is a blog theme with a split, 50:50 layout like Yan Yang.
 Requires at least: 5.8
-Tested up to: 5.9
+Tested up to: 6.3
 Requires PHP: 5.7
-Version: 0.0.1
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: 
 Text Domain: jinjang
-Tags: blog, one-column, two-columns, wide-blocks, block-patterns, custom-background, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, sticky-post, template-editing, threaded-comments, translation-ready
-*//*
+Tags: blog, two-columns, wide-blocks, block-patterns, featured-images, full-site-editing, rtl-language-support, template-editing, threaded-comments, translation-ready
+*/
+
+/*
  * Link styles
  * https://github.com/WordPress/gutenberg/issues/42319
  */
@@ -31,16 +33,6 @@ a {
 	opacity: 1; /* Firefox */
 }
 
-/*
- * Avatar Block
- * Fix border radius setting for the avatar block
- * https://github.com/WordPress/gutenberg/issues/48253
- */
-.wp-block-avatar a,
-.wp-block-avatar img {
-	border-radius: inherit;
-}
-
 /*
  * Button Block
  * Control the hover stylings of outline block style.
@@ -48,9 +40,9 @@ a {
  * https://github.com/WordPress/gutenberg/issues/42794
  */
 .wp-block-button.is-style-outline>.wp-block-button__link:not(.has-background):hover {
-	background-color: var(--wp--preset--color--contrast);
+	background-color: var(--wp--preset--color--primary);
+	border-color: var(--wp--preset--color--primary);
 	color: var(--wp--preset--color--base);
-	border-color: var(--wp--preset--color--contrast);
 }
 
 /*
@@ -58,6 +50,16 @@ a {
  * Reset the browser default margins for blockquote element
  * https://github.com/WordPress/gutenberg/issues/44129
  */
-.wp-block-pullquote blockquote {
+.wp-block-pullquote blockquote,
+.wp-block-pullquote p {
 	margin: 0;
 }
+
+/*
+ * Navigation Block
+ * Reset the padding from List block
+ * https://github.com/WordPress/gutenberg/issues/50486
+ */
+.wp-block-navigation ul {
+	padding: unset;
+}

jinjang/templates/404.html

@@ -12,22 +12,22 @@
 
 	<!-- wp:column -->
 	<div class="wp-block-column">
-		<!-- wp:group {"tagName":"main","style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-		<main class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
+		<!-- wp:group {"style":{"dimensions":{"minHeight":"100vh"},"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
 			<!-- wp:spacer {"height":"0px"} -->
 			<div style="height:0px" aria-hidden="true" class="wp-block-spacer"></div>
 			<!-- /wp:spacer -->
 
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
 				<!-- wp:pattern {"slug":"jinjang/404"} /-->
 
 				<!-- wp:pattern {"slug":"jinjang/search"} /-->
-			</div>
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
-		</main>
+		</div>
 		<!-- /wp:group -->
 	</div>
 	<!-- /wp:column -->

jinjang/templates/archive.html

@@ -14,10 +14,10 @@
 	<div class="wp-block-column">
 		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
-				<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","layout":{"type":"default"}} -->
-				<main class="wp-block-query">
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
+				<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+				<div class="wp-block-query">
 					<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 					<div class="wp-block-group" style="margin-bottom:var(--wp--preset--spacing--70)">
 						<!-- wp:query-title {"type":"archive","showPrefix":false} /-->
@@ -26,14 +26,14 @@
 					</div>
 					<!-- /wp:group -->
 
-					<!-- wp:post-template -->
+					<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|80"}}} -->
 						<!-- wp:group {"layout":{"type":"constrained"}} -->
 						<div class="wp-block-group">
 							<!-- wp:post-featured-image {"isLink":true} /-->
 
-							<!-- wp:post-date {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|30"}}}} /-->
+							<!-- wp:post-title {"isLink":true} /-->
 
-							<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"top":"0px"}}}} /-->
+							<!-- wp:post-date {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30"}}}} /-->
 						</div>
 						<!-- /wp:group -->
 					<!-- /wp:post-template -->
@@ -47,9 +47,9 @@
 						<!-- /wp:query-pagination -->
 					</div>
 					<!-- /wp:group -->
-				</main>
+				</div>
 				<!-- /wp:query -->
-			</div>
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

jinjang/templates/index.html

@@ -14,18 +14,18 @@
 	<div class="wp-block-column">
 		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
-				<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","layout":{"type":"constrained"}} -->
-				<main class="wp-block-query">
-					<!-- wp:post-template -->
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
+				<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"layout":{"type":"constrained"}} -->
+				<div class="wp-block-query">
+					<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|80"}}} -->
 						<!-- wp:group {"layout":{"type":"constrained"}} -->
 						<div class="wp-block-group">
 							<!-- wp:post-featured-image {"isLink":true} /-->
 
-							<!-- wp:post-date {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|30"}}}} /-->
+							<!-- wp:post-title {"isLink":true} /-->
 
-							<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"top":"0px"}}}} /-->
+							<!-- wp:post-date {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30"}}}} /-->
 						</div>
 						<!-- /wp:group -->
 					<!-- /wp:post-template -->
@@ -39,9 +39,9 @@
 						<!-- /wp:query-pagination -->
 					</div>
 					<!-- /wp:group -->
-				</main>
+				</div>
 				<!-- /wp:query -->
-			</div>
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

jinjang/templates/page.html

@@ -14,20 +14,20 @@
 	<div class="wp-block-column">
 		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
-				<!-- wp:group {"tagName":"main","layout":{"type":"constrained","justifyContent":"center"}} -->
-				<main class="wp-block-group">
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
+				<!-- wp:group {"layout":{"type":"constrained","justifyContent":"center"}} -->
+				<div class="wp-block-group">
 					<!-- wp:post-featured-image /-->
 
 					<!-- wp:post-title /-->
 
 					<!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained","justifyContent":"center"}} /-->
-				</main>
+				</div>
 				<!-- /wp:group -->
 
-				<!-- wp:pattern {"slug":"jinjang/comments"} /-->
-			</div>
+				<!-- wp:template-part {"slug":"comments"} /-->
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

jinjang/templates/search.html

@@ -14,20 +14,22 @@
 	<div class="wp-block-column">
 		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
 		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
 				<!-- wp:pattern {"slug":"jinjang/search"} /-->
 
-				<!-- wp:query {"queryId":1,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","layout":{"type":"default"}} -->
-				<main class="wp-block-query">
-					<!-- wp:post-template -->
+				<!-- wp:query-title {"type":"search","style":{"spacing":{"margin":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} /-->
+
+				<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"layout":{"type":"default"}} -->
+				<div class="wp-block-query">
+					<!-- wp:post-template {"style":{"spacing":{"blockGap":"var:preset|spacing|80"}}} -->
 						<!-- wp:group {"layout":{"type":"constrained"}} -->
 						<div class="wp-block-group">
 							<!-- wp:post-featured-image {"isLink":true} /-->
 
-							<!-- wp:post-date {"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|30"}}}} /-->
+							<!-- wp:post-title {"isLink":true} /-->
 
-							<!-- wp:post-title {"isLink":true,"style":{"spacing":{"margin":{"top":"0px"}}}} /-->
+							<!-- wp:post-date {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30"}}}} /-->
 						</div>
 						<!-- /wp:group -->
 					<!-- /wp:post-template -->
@@ -45,9 +47,9 @@
 					<!-- wp:query-no-results -->
 						<!-- wp:pattern {"slug":"jinjang/no-results-content"} /-->
 					<!-- /wp:query-no-results -->
-				</main>
+				</div>
 				<!-- /wp:query -->
-			</div>
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->

jinjang/templates/single.html

@@ -12,17 +12,17 @@
 
 	<!-- wp:column -->
 	<div class="wp-block-column">
-		<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
-		<main class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
-			<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group">
+		<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}},"dimensions":{"minHeight":"100vh"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch","verticalAlignment":"space-between"}} -->
+		<div class="wp-block-group" style="min-height:100vh;padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--70)">
+			<!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
+			<main class="wp-block-group">
 				<!-- wp:group {"layout":{"type":"constrained","justifyContent":"center"}} -->
 				<div class="wp-block-group">
 					<!-- wp:post-featured-image /-->
 
 					<!-- wp:post-title /-->
 
-					<!-- wp:post-date {"style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} /-->
+					<!-- wp:post-date {"style":{"spacing":{"margin":{"top":"var:preset|spacing|30"}}}} /-->
 
 					<!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"constrained","justifyContent":"center"}} /-->
 
@@ -45,11 +45,13 @@
 					<!-- wp:post-navigation-link /-->
 				</div>
 				<!-- /wp:group -->
-			</div>
+
+				<!-- wp:template-part {"slug":"comments"} /-->
+			</main>
 			<!-- /wp:group -->
 
 			<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
-		</main>
+		</div>
 		<!-- /wp:group -->
 	</div>
 	<!-- /wp:column -->

jinjang/theme.json

@@ -79,6 +79,8 @@
 			]
 		},
 		"typography": {
+			"customFontSize": true,
+			"dropCap": true,
 			"fluid": true,
 			"fontFamilies": [
 				{
@@ -148,7 +150,12 @@
 					"size": "6.192rem",
 					"slug": "huge"
 				}
-			]
+			],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"textDecoration": true,
+			"textTransform": true
 		},
 		"useRootPaddingAwareAlignments": true
 	},
@@ -171,18 +178,15 @@
 			"core/avatar": {
 				"border": {
 					"radius": "999px"
-				},
-				"typography": {
-					"lineHeight": "0"
 				}
 			},
 			"core/button": {
 				"spacing": {
 					"padding": {
-						"bottom": "16px",
-						"left": "32px",
-						"right": "32px",
-						"top": "16px"
+						"bottom": "1rem",
+						"left": "2rem",
+						"right": "2rem",
+						"top": "1rem"
 					}
 				},
 				"typography": {
@@ -193,10 +197,10 @@
 					"outline": {
 						"spacing": {
 							"padding": {
-								"bottom": "14px",
-								"left": "30px",
-								"right": "30px",
-								"top": "14px"
+								"bottom": "0.875rem",
+								"left": "1.875rem",
+								"right": "1.875rem",
+								"top": "0.875rem"
 							}
 						}
 					}
@@ -244,12 +248,7 @@
 					"width": "1px"
 				},
 				"spacing": {
-					"padding": {
-						"bottom": "var(--wp--preset--spacing--40)",
-						"left": "var(--wp--preset--spacing--40)",
-						"right": "var(--wp--preset--spacing--40)",
-						"top": "var(--wp--preset--spacing--40)"
-					}
+					"padding": "var(--wp--preset--spacing--40)"
 				},
 				"typography": {
 					"fontFamily": "monospace",
@@ -334,21 +333,24 @@
 					"link": {
 						":hover": {
 							"border": {
-								"color": "var:preset|color|contrast"
+								"color": "var(--wp--preset--color--primary)"
 							},
 							"color": {
-								"background": "var:preset|color|contrast",
-								"text": "var:preset|color|base"
+								"background": "var(--wp--preset--color--primary)",
+								"text": "var(--wp--preset--color--base)"
 							}
 						},
 						"border": {
-							"color": "var:preset|color|primary",
+							"color": "var(--wp--preset--color--contrast)",
 							"radius": "0",
 							"style": "solid",
 							"width": "1px"
 						},
+						"color": {
+							"text": "var(--wp--preset--color--contrast)"
+						},
 						"spacing": {
-							"padding": "3.5px 12px"
+							"padding": "0.21875rem 0.75rem"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -357,7 +359,7 @@
 				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": "1.157407407"
+					"lineHeight": "1"
 				}
 			},
 			"core/comments-pagination": {
@@ -379,25 +381,26 @@
 				}
 			},
 			"core/comments-title": {
+				"spacing": {
+					"margin": {
+						"bottom": "var(--wp--preset--spacing--50)",
+						"top": "var(--wp--preset--spacing--50)"
+					}
+				},
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--large)"
 				}
 			},
 			"core/cover": {
 				"spacing": {
-					"padding": {
-						"bottom": "var(--wp--preset--spacing--50)",
-						"left": "var(--wp--preset--spacing--50)",
-						"right": "var(--wp--preset--spacing--50)",
-						"top": "var(--wp--preset--spacing--50)"
-					}
+					"padding": "var(--wp--preset--spacing--50)"
 				}
 			},
 			"core/image": {
 				"css": " .wp-element-caption{text-align:center;}"
 			},
 			"core/latest-comments": {
-				"css": " .wp-block-latest-comments__comment-date {font-size: var(--wp--preset--font-size--x-small);}.wp-block-latest-comments__comment-excerpt p{font-size: var(--wp--preset--font-size--small);}",
+				"css": " .wp-block-latest-comments__comment-date,.wp-block-latest-comments__comment-excerpt p{font-size: inherit;}.wp-block-latest-comments__comment-excerpt p{margin:0 0 var(--wp--style--block-gap)}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -414,10 +417,13 @@
 					"padding": {
 						"left": "0px"
 					}
+				},
+				"typography": {
+					"lineHeight": "1.47569"
 				}
 			},
 			"core/latest-posts": {
-				"css": " .wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date {font-size: var(--wp--preset--font-size--x-small);}",
+				"css": " .wp-block-latest-posts__post-author,.wp-block-latest-posts__post-date {font-size: inherit;}.wp-block-latest-posts__post-excerpt{margin:0 0 var(--wp--style--block-gap)}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -442,12 +448,12 @@
 				"color": {
 					"text": "var(--wp--preset--color--base)"
 				},
-				"css": ".wp-block-navigation:not(.has-background) .wp-block-navigation__submenu-container {border-color:var(--wp--preset--color--base);} :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-item a:not(.wp-element-button)), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-submenu a:not(.wp-element-button)), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-submenu button.wp-block-navigation-item__content), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-pages-list__item button.wp-block-navigation-item__content) {padding:0.5em;} .wp-block-navigation:not(.has-background) .wp-block-navigation__submenu-container {border-color:var(--wp--preset--color--contrast);} .wp-block-navigation__submenu-container.has-background {padding:0;}",
+				"css": ".wp-block-navigation:not(.has-background) .wp-block-navigation__submenu-container {border-color:var(--wp--preset--color--base);} :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-item a:not(.wp-element-button)), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-submenu a:not(.wp-element-button)), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-navigation-submenu button.wp-block-navigation-item__content), :where(.wp-block-navigation .wp-block-navigation__submenu-container .wp-block-pages-list__item button.wp-block-navigation-item__content) {padding:0.5em;} .wp-block-navigation:not(.has-background) .wp-block-navigation__submenu-container {border-color:var(--wp--preset--color--contrast);} .wp-block-navigation-item__label{display:block;}",
 				"elements": {
 					"link": {
 						":hover": {
 							"color": {
-								"text": "var(--wp--preset--color--primary)"
+								"text": "var(--wp--preset--color--base)"
 							}
 						},
 						"color": {
@@ -532,10 +538,35 @@
 					"lineHeight": "1.5"
 				}
 			},
+			"core/post-comments-count": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.5"
+				}
+			},
 			"core/post-comments-form": {
-				"css": ".wp-block-post-comments-form .comment-form input:not([type=submit]):not([type=checkbox]), .wp-block-post-comments-form .comment-form textarea {line-height: inherit;} .wp-block-post-comments-form .form-submit {margin-bottom: 0;} .wp-block-post-comments-form input:not([type=submit]), .wp-block-post-comments-form textarea {background-color: var(--wp--preset--color--base); border-color: var(--wp--preset--color--contrast); color: var(--wp--preset--color--contrast);}",
+				"css": ".wp-block-post-comments-form .comment-form input:not([type=submit]):not([type=checkbox]), .wp-block-post-comments-form .comment-form textarea {line-height: inherit;} .wp-block-post-comments-form .form-submit {margin-bottom: 0;} .wp-block-post-comments-form .comment-form > *{margin-top:var(--wp--style--block-gap);margin-bottom:0} .wp-block-post-comments-form .comment-reply-title{font-size:var(--wp--preset--font-size--large)}",
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.5"
+				}
+			},
+			"core/post-comments-link": {
+				"elements": {
+					"link": {
+						":hover": {
+							"typography": {
+								"textDecoration": "underline"
+							}
+						},
+						"typography": {
+							"textDecoration": "none"
+						}
+					}
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.5"
 				}
 			},
 			"core/post-date": {
@@ -576,9 +607,6 @@
 					"lineHeight": "1"
 				}
 			},
-			"core/post-template": {
-				"css": ".wp-block-post-template > * + * { margin-block-start: var(--wp--preset--spacing--70)}"
-			},
 			"core/post-terms": {
 				"elements": {
 					"link": {
@@ -599,7 +627,7 @@
 			},
 			"core/post-title": {
 				"color": {
-					"text": "var:preset|color|contrast"
+					"text": "var(--wp--preset--color--contrast)"
 				},
 				"elements": {
 					"link": {
@@ -609,7 +637,7 @@
 							}
 						},
 						"color": {
-							"text": "var:preset|color|contrast"
+							"text": "var(--wp--preset--color--contrast)"
 						},
 						"typography": {
 							"textDecoration": "none"
@@ -617,7 +645,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|x-large",
+					"fontSize": "var(--wp--preset--font-size--x-large)",
 					"fontStyle": "normal",
 					"fontWeight": "700"
 				}
@@ -628,6 +656,7 @@
 					"style": "solid",
 					"width": "1px 0"
 				},
+				"css": ".wp-block-pullquote cite {display:block;margin-top: var(--wp--preset--spacing--50)}",
 				"spacing": {
 					"padding": "var(--wp--preset--spacing--40)"
 				},
@@ -637,7 +666,7 @@
 				}
 			},
 			"core/query-pagination": {
-				"css": ".wp-block-query-pagination>.wp-block-query-pagination-next, .wp-block-query-pagination>.wp-block-query-pagination-numbers, .wp-block-query-pagination>.wp-block-query-pagination-previous {margin: 0;}\n\n.wp-block-query-pagination.wp-block-query-pagination-is-layout-flex {gap:0;}",
+				"css": ".wp-block-query-pagination .wp-block-query-pagination-next, .wp-block-query-pagination .wp-block-query-pagination-previous, .wp-block-query-pagination .wp-block-query-pagination-numbers {margin-bottom:0;}",
 				"elements": {
 					"link": {
 						":hover": {
@@ -675,6 +704,21 @@
 				},
 				"typography": {
 					"fontStyle": "italic"
+				},
+				"variations": {
+					"plain": {
+						"border": {
+							"width": "0"
+						},
+						"spacing": {
+							"padding": {
+								"left": "0"
+							}
+						},
+						"typography": {
+							"fontStyle": "normal"
+						}
+					}
 				}
 			},
 			"core/read-more": {
@@ -700,7 +744,7 @@
 				"border": {
 					"radius": "0px"
 				},
-				"css": " .wp-block-search__input {border-color: var(--wp--preset--color--contrast);} .wp-block-search__button-inside .wp-block-search__inside-wrapper {padding: 2px;} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) {background-color: var(--wp--preset--color--base);border-color: var(--wp--preset--color--contrast);} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-block-search__input {padding: 0 0 0 var(--wp--preset--spacing--40);} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button {padding-right: var(--wp--preset--spacing--40);padding-left: var(--wp--preset--spacing--40);} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button, :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button {background-color: var(--wp--preset--color--base); color: var(--wp--preset--color--contrast);} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button:hover, :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button:focus {background-color: var(--wp--preset--color--base); color: var(--wp--preset--color--primary);}",
+				"css": " :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper){padding:2px;} :where(.wp-block-search__button-inside .wp-block-search__inside-wrapper) .wp-element-button.has-icon {padding:0.75rem}",
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)",
 					"lineHeight": "1"
@@ -756,7 +800,7 @@
 				}
 			},
 			"core/table": {
-				"css": " + .wp-element-caption {font-size: var(--wp--preset--font-size--small); text-align:center;} .wp-block-table td,.wp-block-table th {padding: var(--wp--preset--spacing--30);} .wp-block-table thead {border-bottom: 3px solid;} .wp-block-table tfoot {border-top: 3px solid;}"
+				"css": " thead{border-bottom-width: 1px;} .wp-block-table tfoot{border-top-width: 1px;} .wp-block-table .wp-element-caption{text-align:center;}"
 			},
 			"core/table-of-contents": {
 				"elements": {
@@ -790,7 +834,7 @@
 			"core/term-description": {
 				"css": ".wp-block-term-description p:first-child {margin-top: 0;} .wp-block-term-description p:last-child {margin-bottom: 0;} p {line-height:inherit;}",
 				"typography": {
-					"fontSize": "var:preset|font-size|small",
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"lineHeight": "1.5"
 				}
 			}
@@ -828,10 +872,10 @@
 				},
 				"spacing": {
 					"padding": {
-						"bottom": "18px",
-						"left": "36px",
-						"right": "36px",
-						"top": "18px"
+						"bottom": "1.125rem",
+						"left": "2.25rem",
+						"right": "2.25rem",
+						"top": "1.125rem"
 					}
 				},
 				"typography": {
@@ -842,7 +886,7 @@
 			},
 			"caption": {
 				"color": {
-					"text": "var:preset|color|contrast"
+					"text": "var(--wp--preset--color--contrast)"
 				},
 				"spacing": {
 					"margin": {
@@ -851,12 +895,13 @@
 					}
 				},
 				"typography": {
-					"fontSize": "var:preset|font-size|x-small"
+					"fontSize": "var(--wp--preset--font-size--x-small)"
 				}
 			},
 			"h1": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--xx-large)"
+					"fontSize": "var(--wp--preset--font-size--xx-large)",
+					"lineHeight": "0.988372093"
 				}
 			},
 			"h2": {
@@ -866,22 +911,26 @@
 			},
 			"h3": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "1.205400193"
 				}
 			},
 			"h4": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"lineHeight": "calc(1em + 0.6875rem)"
 				}
 			},
 			"h5": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "1.5"
 				}
 			},
 			"h6": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--x-small)"
+					"fontSize": "var(--wp--preset--font-size--x-small)",
+					"lineHeight": "1.651651652"
 				}
 			},
 			"heading": {
@@ -921,6 +970,10 @@
 		}
 	},
 	"templateParts": [
+		{
+			"area": "uncategorized",
+			"name": "comments"
+		},
 		{
 			"area": "header",
 			"name": "header"