From 34c0e4fb13248ab7d990148354f221b48de7a74c Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 12:35:11 +0100
Subject: [PATCH 1/6] Clean up TT1 Blocks Page Template markup

Fixes "This block contains unexpected or invalid content." in the Content and Comment sections
---
 tt1-blocks/templates/page.html | 86 ++++++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 24 deletions(-)

diff --git a/tt1-blocks/templates/page.html b/tt1-blocks/templates/page.html
index 603cd706..37f9934a 100644
--- a/tt1-blocks/templates/page.html
+++ b/tt1-blocks/templates/page.html
@@ -1,29 +1,67 @@
 <!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
 
 <!-- wp:group {"tagName":"main"} -->
-<main class="wp-block-group">
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"align":"wide"} /-->
-
-		<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
-
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
-
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
-
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:pattern {"slug":"tt1-blocks/comments"} -->
-	</div>
-	<!-- /wp:group -->
-</main>
+<main class="wp-block-group"><!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:post-title {"level":1,"align":"wide"} /-->
+
+<!-- wp:separator {"opacity":"css","className":"alignwide is-style-twentytwentyone-separator-thick"} -->
+<hr class="wp-block-separator has-css-opacity alignwide is-style-twentytwentyone-separator-thick"/>
+<!-- /wp:separator -->
+
+<!-- wp:spacer {"height":"70px"} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
+
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
+
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:spacer {"height":"70px"} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
+<div class="wp-block-comments wp-block-comments-query-loop"><!-- wp:comments-title {"level":3} /-->
+
+<!-- wp:comment-template -->
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"40px"} -->
+<div class="wp-block-column" style="flex-basis:40px"></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"20px"},"spacing":{"margin":{"top":"10px"}}}} /-->
+
+<!-- wp:group -->
+<div class="wp-block-group"><!-- wp:comment-author-name /-->
+
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a"} /-->
+
+<!-- wp:comment-edit-link /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:comment-content /-->
+
+<!-- wp:comment-reply-link /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
+
+<!-- wp:comments-pagination -->
+<!-- wp:comments-pagination-previous /-->
+
+<!-- wp:comments-pagination-numbers /-->
+
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
+
+<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /--></main>
+<!-- /wp:group -->
\ No newline at end of file

From 8a0b9178ce6f24a9c700a4b3ffdc3a65674c7e74 Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 12:47:33 +0100
Subject: [PATCH 2/6] Update theme.json

Update theme.json
---
 tt1-blocks/theme.json | 417 +++++++++++++++++++++---------------------
 1 file changed, 206 insertions(+), 211 deletions(-)

diff --git a/tt1-blocks/theme.json b/tt1-blocks/theme.json
index c30630a9..9ccc86b5 100644
--- a/tt1-blocks/theme.json
+++ b/tt1-blocks/theme.json
@@ -1,260 +1,195 @@
 {
-	"version": 1,
-	"templateParts": [
-		{
-			"name": "header",
-			"area": "header"
-		},
+	"customTemplates": [
 		{
-			"name": "footer",
-			"area": "footer"
+			"name": "page-home",
+			"title": "Page without title"
 		}
 	],
 	"settings": {
 		"appearanceTools": true,
 		"color": {
-			"palette": [
+			"gradients": [
 				{
-					"slug": "black",
-					"color": "#000000",
-					"name": "Black"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--yellow))",
+					"name": "Purple to Yellow",
+					"slug": "purple-to-yellow"
 				},
 				{
-					"slug": "dark-gray",
-					"color": "#28303D",
-					"name": "Dark Gray"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--purple))",
+					"name": "Yellow to Purple",
+					"slug": "yellow-to-purple"
 				},
 				{
-					"slug": "gray",
-					"color": "#39414D",
-					"name": "Gray"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--green), var(--wp--preset--color--yellow))",
+					"name": "Green to Yellow",
+					"slug": "green-to-yellow"
 				},
 				{
-					"slug": "green",
-					"color": "#D1E4DD",
-					"name": "Green"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--green))",
+					"name": "Yellow to Green",
+					"slug": "yellow-to-green"
 				},
 				{
-					"slug": "blue",
-					"color": "#D1DFE4",
-					"name": "Blue"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--yellow))",
+					"name": "Red to Yellow",
+					"slug": "red-to-yellow"
 				},
 				{
-					"slug": "purple",
-					"color": "#D1D1E4",
-					"name": "Purple"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--red))",
+					"name": "Yellow to Red",
+					"slug": "yellow-to-red"
 				},
 				{
-					"slug": "red",
-					"color": "#E4D1D1",
-					"name": "Red"
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--red))",
+					"name": "Purple to Red",
+					"slug": "purple-to-red"
 				},
 				{
-					"slug": "orange",
-					"color": "#E4DAD1",
-					"name": "Orange"
-				},
+					"gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--purple))",
+					"name": "Red to Purple",
+					"slug": "red-to-purple"
+				}
+			],
+			"palette": [
 				{
-					"slug": "yellow",
-					"color": "#EEEADD",
-					"name": "Yellow"
+					"color": "#000000",
+					"name": "Black",
+					"slug": "black"
 				},
 				{
-					"slug": "white",
-					"color": "#FFFFFF",
-					"name": "White"
-				}
-			],
-			"gradients": [
+					"color": "#28303D",
+					"name": "Dark Gray",
+					"slug": "dark-gray"
+				},
 				{
-					"slug": "purple-to-yellow",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--yellow))",
-					"name": "Purple to Yellow"
+					"color": "#39414D",
+					"name": "Gray",
+					"slug": "gray"
 				},
 				{
-					"slug": "yellow-to-purple",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--purple))",
-					"name": "Yellow to Purple"
+					"color": "#D1E4DD",
+					"name": "Green",
+					"slug": "green"
 				},
 				{
-					"slug": "green-to-yellow",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--green), var(--wp--preset--color--yellow))",
-					"name": "Green to Yellow"
+					"color": "#D1DFE4",
+					"name": "Blue",
+					"slug": "blue"
 				},
 				{
-					"slug": "yellow-to-green",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--green))",
-					"name": "Yellow to Green"
+					"color": "#D1D1E4",
+					"name": "Purple",
+					"slug": "purple"
 				},
 				{
-					"slug": "red-to-yellow",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--yellow))",
-					"name": "Red to Yellow"
+					"color": "#E4D1D1",
+					"name": "Red",
+					"slug": "red"
 				},
 				{
-					"slug": "yellow-to-red",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--red))",
-					"name": "Yellow to Red"
+					"color": "#E4DAD1",
+					"name": "Orange",
+					"slug": "orange"
 				},
 				{
-					"slug": "purple-to-red",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--red))",
-					"name": "Purple to Red"
+					"color": "#EEEADD",
+					"name": "Yellow",
+					"slug": "yellow"
 				},
 				{
-					"slug": "red-to-purple",
-					"gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--purple))",
-					"name": "Red to Purple"
+					"color": "#FFFFFF",
+					"name": "White",
+					"slug": "white"
 				}
 			]
 		},
+		"custom": {
+			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+			"font-weight": {
+				"light": "300",
+				"normal": "normal"
+			},
+			"line-height": {
+				"body": 1.7,
+				"heading": 1.3,
+				"page-title": 1.1
+			},
+			"spacing": {
+				"horizontal": "25px",
+				"outer": "calc(0.6 * var(--wp--custom--spacing--horizontal))",
+				"unit": "20px",
+				"vertical": "30px"
+			}
+		},
 		"layout": {
 			"contentSize": "610px",
 			"wideSize": "1240px"
 		},
 		"typography": {
-			"fontSizes": [
+			"fontFamilies": [
 				{
-					"slug": "extra-small",
-					"size": "16px",
-					"name": "Extra small"
+					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
+					"name": "System Font",
+					"slug": "system-font"
 				},
 				{
-					"slug": "small",
-					"size": "18px",
-					"name": "Small"
+					"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
+					"slug": "helvetica-arial"
 				},
 				{
-					"slug": "normal",
-					"size": "20px",
-					"name": "Normal"
+					"fontFamily": "Geneva, Tahoma, Verdana, sans-serif",
+					"slug": "geneva-verdana"
 				},
 				{
-					"slug": "large",
-					"size": "24px",
-					"name": "Large"
+					"fontFamily": "Cambria, Georgia, serif",
+					"slug": "cambria-georgia"
 				},
 				{
-					"slug": "extra-large",
-					"size": "40px",
-					"name": "Extra large"
-				},
+					"fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif",
+					"slug": "hoefler-times-new-roman"
+				}
+			],
+			"fontSizes": [
 				{
-					"slug": "huge",
-					"size": "96px",
-					"name": "Huge"
+					"name": "Extra small",
+					"size": "16px",
+					"slug": "extra-small"
 				},
 				{
-					"slug": "gigantic",
-					"size": "144px",
-					"name": "Gigantic"
-				}
-			],
-			"fontFamilies": [
+					"name": "Small",
+					"size": "18px",
+					"slug": "small"
+				},
 				{
-					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
-					"slug": "system-font",
-					"name": "System Font"
+					"name": "Normal",
+					"size": "20px",
+					"slug": "normal"
 				},
 				{
-					"fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif",
-					"slug": "helvetica-arial"
+					"name": "Large",
+					"size": "24px",
+					"slug": "large"
 				},
 				{
-					"fontFamily": "Geneva, Tahoma, Verdana, sans-serif",
-					"slug": "geneva-verdana"
+					"name": "Extra large",
+					"size": "40px",
+					"slug": "extra-large"
 				},
 				{
-					"fontFamily": "Cambria, Georgia, serif",
-					"slug": "cambria-georgia"
+					"name": "Huge",
+					"size": "96px",
+					"slug": "huge"
 				},
 				{
-					"fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif",
-					"slug": "hoefler-times-new-roman"
+					"name": "Gigantic",
+					"size": "144px",
+					"slug": "gigantic"
 				}
 			]
-		},
-		"custom": {
-			"font-primary": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
-			"line-height": {
-				"body": 1.7,
-				"heading": 1.3,
-				"page-title": 1.1
-			},
-			"spacing": {
-				"unit": "20px",
-				"horizontal": "25px",
-				"vertical": "30px",
-				"outer": "calc(0.6 * var(--wp--custom--spacing--horizontal))"
-			},
-			"font-weight":{
-				"light": "300",
-				"normal": "normal"
-			}
 		}
 	},
 	"styles": {
-		"color": {
-			"background": "var(--wp--preset--color--green)",
-			"text": "var(--wp--preset--color--dark-gray)"
-		},
-		"typography": {
-			"fontSize": "var(--wp--preset--font-size--normal)",
-			"lineHeight": "var(--wp--custom--line-height--body)"
-		},
-		"elements": {
-			"link": {
-				"color": {
-					"text": "var(--wp--preset--color--dark-gray)"
-				}
-			},
-			"h1": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--gigantic)",
-					"lineHeight": "var(--wp--custom--line-height--page-title)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--extra-large)",
-					"lineHeight": "var(--wp--custom--line-height--heading)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontSize": "calc(1.25 * var(--wp--preset--font-size--large))",
-					"lineHeight": "var(--wp--custom--line-height--heading)",
-					"fontWeight": "var(--wp--custom--font-weight--normal)"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			},
-			"h6": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--extra-small)",
-					"lineHeight": "var(--wp--custom--line-height--heading)"
-				}
-			}
-		},
 		"blocks": {
-			"core/site-tagline": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"lineHeight": 1.4
-				}
-			},
 			"core/button": {
 				"border": {
 					"radius": "0px"
@@ -268,6 +203,22 @@
 					"fontWeight": 500
 				}
 			},
+			"core/code": {
+				"border": {
+					"color": "var(--wp--preset--color--dark-gray)",
+					"radius": "0px",
+					"style": "solid",
+					"width": "1.5px"
+				},
+				"spacing": {
+					"padding": {
+						"bottom": "var(--wp--custom--spacing--unit)",
+						"left": "var(--wp--custom--spacing--unit)",
+						"right": "var(--wp--custom--spacing--unit)",
+						"top": "var(--wp--custom--spacing--unit)"
+					}
+				}
+			},
 			"core/comment-author-name": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
@@ -307,29 +258,29 @@
 				}
 			},
 			"core/pullquote": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)",
-					"fontWeight": "700"
+				"border": {
+					"radius": "0px",
+					"style": "solid none",
+					"width": "var(--wp--custom--border--width)"
 				},
 				"spacing": {
 					"padding": {
-						"top": "calc(2 * var(--wp--custom--spacing--unit))",
 						"bottom": "calc(2 * var(--wp--custom--spacing--unit))",
 						"left": "0",
-						"right": "0"
+						"right": "0",
+						"top": "calc(2 * var(--wp--custom--spacing--unit))"
 					}
 				},
-				"border": {
-					"radius": "0px",
-					"style": "solid none",
-					"width": "var(--wp--custom--border--width)"
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"fontWeight": "700"
 				}
 			},
 			"core/site-tagline": {
 				"spacing": {
 					"margin": {
-						"top": "0",
-						"bottom": "0"
+						"bottom": "0",
+						"top": "0"
 					}
 				}
 			},
@@ -339,29 +290,73 @@
 					"fontWeight": "var(--wp--custom--font-weight--normal)",
 					"textTransform": "uppercase"
 				}
+			}
+		},
+		"color": {
+			"background": "var(--wp--preset--color--green)",
+			"text": "var(--wp--preset--color--dark-gray)"
+		},
+		"elements": {
+			"h1": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--gigantic)",
+					"fontWeight": "var(--wp--custom--font-weight--normal)",
+					"lineHeight": "var(--wp--custom--line-height--page-title)"
+				}
 			},
-			"core/code": {
-				"spacing": {
-					"padding": {
-						"top": "var(--wp--custom--spacing--unit)",
-						"bottom": "var(--wp--custom--spacing--unit)",
-						"left": "var(--wp--custom--spacing--unit)",
-						"right": "var(--wp--custom--spacing--unit)"
-					}
-				},
-				"border": {
-					"radius": "0px",
-					"color": "var(--wp--preset--color--dark-gray)",
-					"style": "solid",
-					"width": "1.5px"
+			"h2": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--extra-large)",
+					"fontWeight": "var(--wp--custom--font-weight--normal)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h3": {
+				"typography": {
+					"fontSize": "calc(1.25 * var(--wp--preset--font-size--large))",
+					"fontWeight": "var(--wp--custom--font-weight--normal)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h4": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h5": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"h6": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--extra-small)",
+					"lineHeight": "var(--wp--custom--line-height--heading)"
+				}
+			},
+			"link": {
+				"color": {
+					"text": "var(--wp--preset--color--dark-gray)"
 				}
 			}
+		},
+		"typography": {
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"lineHeight": "var(--wp--custom--line-height--body)"
 		}
 	},
-	"customTemplates": [
+	"templateParts": [
 		{
-			"name": "page-home",
-			"title": "Page without title"
+			"area": "header",
+			"name": "header"
+		},
+		{
+			"area": "footer",
+			"name": "footer"
 		}
-	]
+	],
+	"version": 2,
+	"$schema": "https://schemas.wp.org/wp/6.5/theme.json"
 }
\ No newline at end of file

From f84868b9be177cabef712b2742f4ab3698f4c32a Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 12:48:03 +0100
Subject: [PATCH 3/6] Clean up Single Post Template

Fixes "This block contains unexpected or invalid content."
---
 tt1-blocks/templates/single.html | 109 +++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 36 deletions(-)

diff --git a/tt1-blocks/templates/single.html b/tt1-blocks/templates/single.html
index 696fd95a..95c8e51a 100644
--- a/tt1-blocks/templates/single.html
+++ b/tt1-blocks/templates/single.html
@@ -1,52 +1,89 @@
 <!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
 
 <!-- wp:group {"tagName":"main"} -->
-<div class="wp-block-group">
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:post-title {"level":1,"align":"wide","style":{"typography":{"fontWeight":"300"}}} /-->
+<main class="wp-block-group"><!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:post-title {"level":1,"align":"wide","style":{"typography":{"fontWeight":"300"}}} /-->
 
-		<!-- wp:separator {"align":"wide","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator alignwide is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
+<!-- wp:separator {"opacity":"css","className":"alignwide is-style-twentytwentyone-separator-thick"} -->
+<hr class="wp-block-separator has-css-opacity alignwide is-style-twentytwentyone-separator-thick"/>
+<!-- /wp:separator -->
 
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
-	</div>
-	<!-- /wp:group -->
+<!-- wp:spacer {"height":"70px"} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer --></div>
+<!-- /wp:group -->
+
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
+
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:spacer {"height":"70px"} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:separator {"opacity":"css","className":"aligncenter is-style-twentytwentyone-separator-thick"} -->
+<hr class="wp-block-separator has-css-opacity aligncenter is-style-twentytwentyone-separator-thick"/>
+<!-- /wp:separator -->
+
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column -->
+<div class="wp-block-column"><!-- wp:post-date /-->
+
+<!-- wp:post-author {"showAvatar":false,"byline":""} /--></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:post-terms {"term":"category","textAlign":"right"} /-->
 
-	<!-- wp:post-content {"layout":{"inherit":true}} /-->
+<!-- wp:post-terms {"term":"post_tag","textAlign":"right"} /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
 
-	<!-- wp:group {"layout":{"inherit":true}} -->
-	<div class="wp-block-group">
-		<!-- wp:spacer {"height":70} -->
-		<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
-		<!-- /wp:spacer -->
+<!-- wp:spacer {"height":"70px"} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-		<!-- wp:separator {"align":"center","className":"is-style-twentytwentyone-separator-thick"} -->
-		<hr class="wp-block-separator aligncenter is-style-twentytwentyone-separator-thick"/>
-		<!-- /wp:separator -->
+<!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
+<div class="wp-block-comments wp-block-comments-query-loop"><!-- wp:comments-title {"level":3} /-->
+
+<!-- wp:comment-template -->
+<!-- wp:columns -->
+<div class="wp-block-columns"><!-- wp:column {"width":"40px"} -->
+<div class="wp-block-column" style="flex-basis:40px"></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:group {"style":{"spacing":{"blockGap":"10px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"20px"},"spacing":{"margin":{"top":"10px"}}}} /-->
+
+<!-- wp:group -->
+<div class="wp-block-group"><!-- wp:comment-author-name /-->
+
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a"} /-->
+
+<!-- wp:comment-edit-link /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
 
-		<!-- wp:columns -->
-		<div class="wp-block-columns"><!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:post-date /-->
+<!-- wp:comment-content /-->
 
-		<!-- wp:post-author {"showAvatar":false,"byline":""} /--></div>
-		<!-- /wp:column -->
+<!-- wp:comment-reply-link /--></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
 
-		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:post-terms {"term":"category","textAlign":"right"} /-->
+<!-- wp:comments-pagination -->
+<!-- wp:comments-pagination-previous /-->
 
-		<!-- wp:post-terms {"term":"post_tag","textAlign":"right"} /--></div>
-		<!-- /wp:column --></div>
-		<!-- /wp:columns -->
+<!-- wp:comments-pagination-numbers /-->
 
-		<!-- wp:pattern {"slug":"tt1-blocks/comments"} -->
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
 
-	</div>
-	<!-- /wp:group -->
-</div>
+<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /--></main>
+<!-- /wp:group -->
\ No newline at end of file

From dbe00084a4ef2bd8ed3ce41ce2c6f3e6a1005c95 Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 16:33:37 +0100
Subject: [PATCH 4/6] Create Archive Template

Initial pass on the archive template block structure.

There are some inline styles that need to be cleaned up, and there more fine adjustments that need to be made in the border setup.
---
 archivist/templates/archive.html | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 archivist/templates/archive.html

diff --git a/archivist/templates/archive.html b/archivist/templates/archive.html
new file mode 100644
index 00000000..3535d9d7
--- /dev/null
+++ b/archivist/templates/archive.html
@@ -0,0 +1,39 @@
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40","right":"var:preset|spacing|40"},"blockGap":"0px","margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="background-color:#edece8;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"},"border":{"radius":"12px","color":"#131b1e"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-border-color" style="border-color:#131b1e;border-radius:12px"><!-- wp:group {"style":{"border":{"radius":{"topLeft":"12px","topRight":"12px"}},"color":{"background":"#131b1e"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="border-top-left-radius:12px;border-top-right-radius:12px;background-color:#131b1e"><!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"margin":{"top":"0"}},"border":{"radius":"12px"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="border-radius:12px;background-color:#edece8;margin-top:0;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--60)"><!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"right":"0","left":"0"}}}} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"style":{"border":{"radius":"12px","width":"0px","style":"none"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="border-style:none;border-width:0px;border-radius:12px"><!-- wp:query {"queryId":2,"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 {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:post-template {"align":"full","style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"grid","columnCount":4}} -->
+<!-- wp:group {"backgroundColor":"black","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-black-background-color has-background"><!-- wp:group {"style":{"border":{"radius":"12px","top":{"width":"2px"},"right":{"radius":"12px","width":"1px"},"bottom":{"width":"1px"},"left":{"radius":"12px","width":"1px"}},"color":{"background":"#edece8"},"dimensions":{"minHeight":"412px"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"bottom"}} -->
+<div class="wp-block-group has-background" style="border-radius:12px;border-top-width:2px;border-right-width:1px;border-bottom-width:1px;border-left-width:1px;background-color:#edece8;min-height:412px"><!-- wp:post-date {"isLink":true,"style":{"typography":{"textTransform":"uppercase"}}} /-->
+
+<!-- wp:post-title {"isLink":true} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+<!-- /wp:post-template --></div>
+<!-- /wp:group --></main>
+<!-- /wp:query --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:query-pagination -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-numbers /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file

From 8c257a153b4f1b59599e41d831ecd19d39f6d043 Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 17:04:18 +0100
Subject: [PATCH 5/6] Revert "Create Archive Template"

This reverts commit dbe00084a4ef2bd8ed3ce41ce2c6f3e6a1005c95.
---
 archivist/templates/archive.html | 39 --------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 archivist/templates/archive.html

diff --git a/archivist/templates/archive.html b/archivist/templates/archive.html
deleted file mode 100644
index 3535d9d7..00000000
--- a/archivist/templates/archive.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40","right":"var:preset|spacing|40"},"blockGap":"0px","margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"default"}} -->
-<div class="wp-block-group has-background" style="background-color:#edece8;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"},"border":{"radius":"12px","color":"#131b1e"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color" style="border-color:#131b1e;border-radius:12px"><!-- wp:group {"style":{"border":{"radius":{"topLeft":"12px","topRight":"12px"}},"color":{"background":"#131b1e"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group has-background" style="border-top-left-radius:12px;border-top-right-radius:12px;background-color:#131b1e"><!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"margin":{"top":"0"}},"border":{"radius":"12px"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group has-background" style="border-radius:12px;background-color:#edece8;margin-top:0;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--60)"><!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"right":"0","left":"0"}}}} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"style":{"border":{"radius":"12px","width":"0px","style":"none"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group" style="border-style:none;border-width:0px;border-radius:12px"><!-- wp:query {"queryId":2,"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 {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"layout":{"type":"default"}} -->
-<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:post-template {"align":"full","style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"grid","columnCount":4}} -->
-<!-- wp:group {"backgroundColor":"black","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-black-background-color has-background"><!-- wp:group {"style":{"border":{"radius":"12px","top":{"width":"2px"},"right":{"radius":"12px","width":"1px"},"bottom":{"width":"1px"},"left":{"radius":"12px","width":"1px"}},"color":{"background":"#edece8"},"dimensions":{"minHeight":"412px"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"bottom"}} -->
-<div class="wp-block-group has-background" style="border-radius:12px;border-top-width:2px;border-right-width:1px;border-bottom-width:1px;border-left-width:1px;background-color:#edece8;min-height:412px"><!-- wp:post-date {"isLink":true,"style":{"typography":{"textTransform":"uppercase"}}} /-->
-
-<!-- wp:post-title {"isLink":true} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
-<!-- /wp:post-template --></div>
-<!-- /wp:group --></main>
-<!-- /wp:query --></div>
-<!-- /wp:group --></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
-
-<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:query-pagination -->
-<!-- wp:query-pagination-previous /-->
-
-<!-- wp:query-pagination-numbers /-->
-
-<!-- wp:query-pagination-next /-->
-<!-- /wp:query-pagination --></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file

From c08d5a06644f17934bae264793388f38903e0620 Mon Sep 17 00:00:00 2001
From: liviopv <livio.vilela@automattic.com>
Date: Fri, 17 May 2024 17:05:29 +0100
Subject: [PATCH 6/6] First pass at Term Archive template

General block structure. It needs a fix for the bottom left, and some cleanup
---
 term/templates/archive.html | 39 +++++++++++++++++++++++++++++++++++++
 term/theme.json             |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 term/templates/archive.html

diff --git a/term/templates/archive.html b/term/templates/archive.html
new file mode 100644
index 00000000..91c165ef
--- /dev/null
+++ b/term/templates/archive.html
@@ -0,0 +1,39 @@
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"top":"var:preset|spacing|40","bottom":"var:preset|spacing|40","left":"var:preset|spacing|40","right":"var:preset|spacing|40"},"blockGap":"0px","margin":{"top":"0px","bottom":"0px"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="background-color:#edece8;margin-top:0px;margin-bottom:0px;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--40);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--40)"><!-- wp:group {"style":{"spacing":{"blockGap":"0px"},"border":{"radius":"12px","color":"#131b1e"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-border-color" style="border-color:#131b1e;border-radius:12px"><!-- wp:group {"style":{"border":{"radius":{"topLeft":"12px","topRight":"12px"}},"color":{"background":"#131b1e"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="border-top-left-radius:12px;border-top-right-radius:12px;background-color:#131b1e"><!-- wp:group {"style":{"color":{"background":"#edece8"},"spacing":{"padding":{"right":"var:preset|spacing|60","left":"var:preset|spacing|60","top":"var:preset|spacing|40","bottom":"var:preset|spacing|40"},"margin":{"top":"0"}},"border":{"radius":"12px"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group has-background" style="border-radius:12px;background-color:#edece8;margin-top:0;padding-top:var(--wp--preset--spacing--40);padding-right:var(--wp--preset--spacing--60);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--60)"><!-- wp:query-title {"type":"archive","style":{"spacing":{"margin":{"top":"0","bottom":"0"},"padding":{"right":"0","left":"0"}}}} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"style":{"border":{"width":"0px","style":"none"}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="border-style:none;border-width:0px"><!-- wp:query {"queryId":2,"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 {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","bottom":"0","left":"0","right":"0"}}},"layout":{"type":"default"}} -->
+<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:post-template {"align":"full","style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"grid","columnCount":4}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"0rem","padding":{"top":"0px","bottom":"0px","left":"0px","right":"0px"}}},"backgroundColor":"black","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-black-background-color has-background" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"border":{"radius":"12px","top":{"width":"2px"},"right":{"radius":"12px","width":"1px"},"bottom":{"width":"1px"},"left":{"radius":"12px","width":"1px"}},"color":{"background":"#edece8"},"dimensions":{"minHeight":"412px"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"bottom"}} -->
+<div class="wp-block-group has-background" style="border-radius:12px;border-top-width:2px;border-right-width:1px;border-bottom-width:1px;border-left-width:1px;background-color:#edece8;min-height:412px"><!-- wp:post-date {"isLink":true,"style":{"typography":{"textTransform":"uppercase"}}} /-->
+
+<!-- wp:post-title {"isLink":true} /--></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+<!-- /wp:post-template --></div>
+<!-- /wp:group --></main>
+<!-- /wp:query --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"layout":{"inherit":true,"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:query-pagination -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-numbers /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/term/theme.json b/term/theme.json
index 973edf55..aaae1d1e 100644
--- a/term/theme.json
+++ b/term/theme.json
@@ -50,5 +50,5 @@
 		}
 	],
 	"version": 2,
-	"$schema": "https://schemas.wp.org/wp/6.4/theme.json"
+	"$schema": "https://schemas.wp.org/wp/6.5/theme.json"
 }
\ No newline at end of file