Merge branch 'trunk' into fix/post-title-spacing-fix-course-lesson

adventurer/patterns/sidebar.php

@@ -7,50 +7,50 @@
 
 ?>
 
-<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull">
-    <!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"tertiary","layout":{"type":"constrained"}} -->
-    <div class="wp-block-group has-tertiary-background-color has-background" 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:paragraph {"style":{"typography":{"letterSpacing":"1px","fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","fontSize":"0.8rem"}}} -->
-        <p style="font-size:0.8rem;font-style:normal;font-weight:500;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest Stories', 'adventurer' ); ?></p>
-        <!-- /wp:paragraph -->
-
-        <!-- wp:query {"queryId":24,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"type":"default"}} -->
-        <div class="wp-block-query">
-            <!-- wp:post-template -->
-            <!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
-            <div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-                <!-- wp:post-featured-image {"isLink":true,"width":"","height":"160px","align":"wide","style":{"border":{"radius":"0px","top":{"radius":"0px","width":"0px","style":"none"},"right":{"color":"#f5f2eb00","width":"0px","style":"none"},"bottom":{"radius":"0px","width":"0px","style":"none"},"left":{"radius":"0px","width":"0px","style":"none"}},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} /-->
-
-                <!-- wp:post-title {"isLink":true,"fontSize":"medium"} /-->
-
-                <!-- wp:post-date {"displayType":"modified","style":{"typography":{"fontSize":"0.6rem","textTransform":"uppercase","letterSpacing":"0.05em","fontStyle":"normal","fontWeight":"500"}}} /-->
-
-                <!-- wp:spacer {"height":"10px"} -->
-                <div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
-                <!-- /wp:spacer -->
-            </div>
-            <!-- /wp:group -->
-            <!-- /wp:post-template -->
-        </div>
-        <!-- /wp:query -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained","contentSize":"1100px"}} -->
-    <div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" 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 {"level":3,"style":{"typography":{"textTransform":"uppercase","fontSize":"0.8rem","letterSpacing":"1px"}},"fontFamily":"roboto"} -->
-        <h3 class="wp-block-heading has-roboto-font-family" style="font-size:0.8rem;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest trips', 'adventurer' ); ?></h3>
-        <!-- /wp:heading -->
-
-        <!-- wp:heading {"style":{"typography":{"lineHeight":1.1,"textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"large"} -->
-        <h2 class="wp-block-heading has-large-font-size" id="botswana-new-zealand-south-korea-japan-madagascar" style="font-style:normal;font-weight:900;line-height:1.1;text-transform:uppercase"><a href=""><?php echo esc_html__( 'ITALY', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'COSTA RICA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'CANADA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'LAOS', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'TURKEY', 'adventurer' ); ?></a></h2>
-        <!-- /wp:heading -->
-    </div>
-    <!-- /wp:group -->
-
-    <!-- wp:spacer {"height":"170px"} -->
-    <div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
-    <!-- /wp:spacer -->
-</div>
+<!-- wp:group {"tagName":"aside","align":"full","style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"layout":{"type":"constrained"}} -->
+<aside class="wp-block-group alignfull">
+	<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|60","right":"var:preset|spacing|60","bottom":"var:preset|spacing|60","left":"var:preset|spacing|60"}}},"backgroundColor":"tertiary","layout":{"type":"constrained"}} -->
+	<div class="wp-block-group has-tertiary-background-color has-background" 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:paragraph {"style":{"typography":{"letterSpacing":"1px","fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","fontSize":"0.8rem"}}} -->
+		<p style="font-size:0.8rem;font-style:normal;font-weight:500;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest Stories', 'adventurer' ); ?></p>
+		<!-- /wp:paragraph -->
+
+		<!-- wp:query {"queryId":24,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"layout":{"type":"default"}} -->
+		<div class="wp-block-query">
+			<!-- wp:post-template -->
+			<!-- wp:group {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|20","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained"}} -->
+			<div class="wp-block-group alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+				<!-- wp:post-featured-image {"isLink":true,"width":"","height":"160px","align":"wide","style":{"border":{"radius":"0px","top":{"radius":"0px","width":"0px","style":"none"},"right":{"color":"#f5f2eb00","width":"0px","style":"none"},"bottom":{"radius":"0px","width":"0px","style":"none"},"left":{"radius":"0px","width":"0px","style":"none"}},"spacing":{"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} /-->
+
+				<!-- wp:post-title {"isLink":true,"fontSize":"medium"} /-->
+
+				<!-- wp:post-date {"displayType":"modified","style":{"typography":{"fontSize":"0.6rem","textTransform":"uppercase","letterSpacing":"0.05em","fontStyle":"normal","fontWeight":"500"}}} /-->
+
+				<!-- wp:spacer {"height":"10px"} -->
+				<div style="height:10px" aria-hidden="true" class="wp-block-spacer"></div>
+				<!-- /wp:spacer -->
+			</div>
+			<!-- /wp:group -->
+			<!-- /wp:post-template -->
+		</div>
+		<!-- /wp:query -->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|60","bottom":"var:preset|spacing|60","right":"var:preset|spacing|60","left":"var:preset|spacing|60"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained","contentSize":"1100px"}} -->
+	<div class="wp-block-group alignfull has-background-color has-primary-background-color has-text-color has-background has-link-color" 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 {"level":3,"style":{"typography":{"textTransform":"uppercase","fontSize":"0.8rem","letterSpacing":"1px"}},"fontFamily":"roboto"} -->
+		<h3 class="wp-block-heading has-roboto-font-family" style="font-size:0.8rem;letter-spacing:1px;text-transform:uppercase"><?php echo esc_html__( 'Latest trips', 'adventurer' ); ?></h3>
+		<!-- /wp:heading -->
+
+		<!-- wp:heading {"style":{"typography":{"lineHeight":1.1,"textTransform":"uppercase","fontStyle":"normal","fontWeight":"900"}},"fontSize":"large"} -->
+		<h2 class="wp-block-heading has-large-font-size" id="botswana-new-zealand-south-korea-japan-madagascar" style="font-style:normal;font-weight:900;line-height:1.1;text-transform:uppercase"><a href=""><?php echo esc_html__( 'ITALY', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'COSTA RICA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'CANADA', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'LAOS', 'adventurer' ); ?></a><br><a href=""><?php echo esc_html__( 'TURKEY', 'adventurer' ); ?></a></h2>
+		<!-- /wp:heading -->
+	</div>
+	<!-- /wp:group -->
+
+	<!-- wp:spacer {"height":"170px"} -->
+	<div style="height:170px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+</aside>
 <!-- /wp:group -->

adventurer/readme.txt

@@ -12,6 +12,9 @@ A theme for travelers, writers and photographers.
 
 == Changelog ==
 
+= 1.0.3 =
+* Rainfall & Adventurer: Update sidebar tag to `aside` (#7284)
+
 = 1.0.2 =
 * Update new theme links to point to WPCOM instead of GitHub (#6969)
 

adventurer/style.css

@@ -7,7 +7,7 @@ Description: A theme for travelers, writers and photographers.
 Requires at least: 6.1
 Tested up to: 6.1.1
 Requires PHP: 5.7
-Version: 1.0.2
+Version: 1.0.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: 

aldente/readme.txt

@@ -12,6 +12,9 @@ Al Dente is a blog theme perfect for blogs whose posts are categorised, for exam
 
 == Changelog ==
 
+= 1.0.2 =
+* Al Dente: Change the markup of the sidebar to aside (#7281)
+
 = 1.0.1 =
 * Al Dente: Remove post navigation from page template (#7185)
 

aldente/style.css

@@ -7,7 +7,7 @@ Description: Al Dente is a blog theme perfect for blogs whose posts are categori
 Requires at least: 6.0
 Tested up to: 6.2.2
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: aldente

aldente/templates/404.html

@@ -15,7 +15,7 @@
 
 		<!-- wp:column {"width":"30%","layout":{"type":"default"}} -->
 		<div class="wp-block-column" style="flex-basis: 30%">
-			<!-- wp:template-part {"slug":"sidebar"} /-->
+			<!-- wp:template-part {"slug":"sidebar","tagName":"aside"} /-->
 		</div>
 		<!-- /wp:column -->
 	</div>

aldente/templates/page.html

@@ -51,7 +51,7 @@
 
 		<!-- wp:column {"width":"30%"} -->
 		<div class="wp-block-column" style="flex-basis: 30%">
-			<!-- wp:template-part {"slug":"sidebar"} /-->
+			<!-- wp:template-part {"slug":"sidebar","tagName":"aside"} /-->
 		</div>
 		<!-- /wp:column -->
 	</div>

aldente/templates/single.html

@@ -80,7 +80,7 @@
 
 		<!-- wp:column {"width":"30%","layout":{"type":"default"}} -->
 		<div class="wp-block-column" style="flex-basis: 30%">
-			<!-- wp:template-part {"slug":"sidebar"} /-->
+			<!-- wp:template-part {"slug":"sidebar","tagName":"aside"} /-->
 		</div>
 		<!-- /wp:column -->
 	</div>

alves/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "alves",
-	"version": "1.5.26",
+	"version": "1.5.27",
 	"description": "Alves",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

alves/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.26
+Version: 1.5.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

alves/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.26
+Version: 1.5.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

alves/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Convincing design for your charity or organization’s online presence. Highlight your actions, causes and projects, Alves is versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.5.26
+Version: 1.5.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

archeo/readme.txt

@@ -12,6 +12,9 @@ A theme inspired by Mayan history and culture.
 
 == Changelog ==
 
+= 1.0.20 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 1.0.19 =
 * Make theme available for translation as much as possible (#6484)
 

archeo/style.css

@@ -7,11 +7,11 @@ Description: A theme inspired by Mayan history and culture
 Requires at least: 5.8
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 1.0.19
+Version: 1.0.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: archeo
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage, blog-homepage
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
 
 Archeo WordPress Theme, (C) 2022 Automattic, Inc.
 Archeo is distributed under the terms of the GNU GPL.

artly/readme.txt

@@ -12,6 +12,9 @@ Artly is a WordPress theme designed for blogs and magazines. Its modern, offset
 
 == Changelog ==
 
+= 1.0.2 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 1.0.1 =
 * Artly: remove theme key from template parts links in templates
 

artly/style.css

@@ -7,11 +7,11 @@ Description: Artly is a WordPress theme designed for blogs and magazines. Its mo
 Requires at least: 5.8
 Tested up to: 6.2
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: artly
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
 */
 
 /*
@@ -32,4 +32,4 @@ Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, feature
 a {
 	text-decoration-thickness: .0625em !important;
 	text-underline-offset: .15em;
-}
+}

balasana/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "balasana",
-	"version": "1.3.25",
+	"version": "1.3.26",
 	"description": "Balasana",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

balasana/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.25
+Version: 1.3.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

balasana/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.25
+Version: 1.3.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

balasana/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Balasana is a clean and minimalist business theme designed with health and wellness-focused sites in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.25
+Version: 1.3.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "barnsbury",
-	"version": "1.3.26",
+	"version": "1.3.27",
 	"description": "Barnsbury",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

barnsbury/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

bibimbap/readme.txt

@@ -12,6 +12,9 @@ A simple and fun restaurant theme.
 
 == Changelog ==
 
+= 1.0.5 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 1.0.4 =
 * Update new theme links to point to WPCOM instead of GitHub (#6969)
 

bibimbap/style.css

@@ -7,12 +7,12 @@ Description: A simple and fun restaurant theme.
 Requires at least: 6.1
 Tested up to: 6.1
 Requires PHP: 5.7
-Version: 1.0.4
+Version: 1.0.5
 License: GNU General Public License v2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Template: 
 Text Domain: bibimbap
-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, auto-loading-homepage, wide-blocks, food-and-drink
+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, food-and-drink
 */
 
 /*
@@ -33,4 +33,4 @@ Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, feature
 a {
 	text-decoration-thickness: .0625em !important;
 	text-underline-offset: .15em;
-}
+}

bitacora/patterns/sidebar.php

@@ -5,12 +5,12 @@
  * Categories: featured, columns
  */
 ?>
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
+<!-- wp:group {"tagName":"aside","layout":{"type":"constrained"}} -->
+<aside class="wp-block-group">
 	<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group" style="padding-bottom:var(--wp--preset--spacing--70)">
 		<!-- wp:heading {"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"500","textTransform":"uppercase","letterSpacing":"0.2em"}},"fontSize":"small"} -->
-<h3 class="wp-block-heading has-small-font-size" style="font-style:normal;font-weight:500;letter-spacing:0.2em;text-transform:uppercase"><?php _e( 'About Me', 'bitacora' ); ?></h3>
+		<h3 class="wp-block-heading has-small-font-size" style="font-style:normal;font-weight:500;letter-spacing:0.2em;text-transform:uppercase"><?php _e( 'About Me', 'bitacora' ); ?></h3>
 		<!-- /wp:heading -->
 
 		<!-- wp:paragraph {"fontSize":"small"} -->
@@ -48,5 +48,5 @@
 		<!-- /wp:jetpack/subscriptions -->
 	</div>
 	<!-- /wp:group -->
-</div>
+</aside>
 <!-- /wp:group -->

bitacora/readme.txt

@@ -12,6 +12,9 @@ Bitácora is a simple old-school blog theme.
 
 == Changelog ==
 
+= 1.0.8 =
+* Bitacora: Edit sidebar markup to use aside (#7278)
+
 = 1.0.7 =
 * Small tweaks to force update following `style-variations` tag fix (#7209)
 

bitacora/style.css

@@ -7,7 +7,7 @@ Description: Bitácora is a simple old-school blog theme.
 Requires at least: 6.0
 Tested up to: 6.1.1
 Requires PHP: 5.7
-Version: 1.0.7
+Version: 1.0.8
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: 

blank-canvas-blocks/readme.txt

@@ -12,6 +12,9 @@ Blank Canvas is a minimalist theme, designed for single-page websites. Its singl
 
 == Changelog ==
 
+= 0.0.8 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 0.0.7 =
 * lock post-content block by default (#6314)
 

blank-canvas-blocks/style.css

@@ -7,10 +7,10 @@ Description: Blank Canvas is a minimalist theme, designed for single-page websit
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 0.0.7
+Version: 0.0.8
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase
 Text Domain: blank-canvas-blocks
-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, auto-loading-homepage
+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
 */

blank-canvas/readme.txt

@@ -16,6 +16,9 @@ The theme’s default styles are conservative, relying on simple sans-serif font
 
 == Changelog ==
 
+= 1.2.11 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 1.2.9 =
 * Code cleanup.
 

blank-canvas/style.css

@@ -7,13 +7,13 @@ Description: Blank Canvas is a minimalist theme, designed for single-page websit
 Requires at least: 4.9.6
 Tested up to: 5.6
 Requires PHP: 5.6.2
-Version: 1.2.10-wpcom
+Version: 1.2.11-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Status: inactive
 Template: seedlet
 Text Domain: blank-canvas
-Tags: one-column, accessibility-ready, custom-colors, editor-style, featured-images, rtl-language-support, sticky-post, translation-ready, auto-loading-homepage
+Tags: one-column, accessibility-ready, custom-colors, editor-style, featured-images, rtl-language-support, sticky-post, translation-ready
 
 Blank Canvas WordPress Theme, (C) 2021 Automattic, Inc.
 Blank Canvas is distributed under the terms of the GNU GPL.

block-canvas/readme.txt

@@ -12,6 +12,12 @@ Block Canvas is a simple theme that supports full-site editing. It comes with a
 
 == Changelog ==
 
+= 0.0.29 =
+* Remove auto-loading-homepage tag. (#7300)
+
+= 0.0.28 =
+* Remove Rubik font from heading definition (#7267)
+
 = 0.0.27 =
 * Add link styles for post-terms (#7058)
 

block-canvas/style.css

@@ -7,11 +7,11 @@ Description: Block Canvas is a simple theme that supports full-site editing. It
 Requires at least: 6.0
 Tested up to: 6.0
 Requires PHP: 5.7
-Version: 0.0.27
+Version: 0.0.29
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: block-canvas
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
 
 Block Canvas WordPress Theme, (C) 2022 Automattic, Inc.
 Block Canvas is distributed under the terms of the GNU GPL.

block-canvas/theme.json

@@ -339,7 +339,6 @@
 			},
 			"heading": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--rubik)",
 					"fontWeight": "400",
 					"lineHeight": "1.125"
 				}

blockbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockbase",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Blank Parent Theme",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues/new?label=[Theme]%20Blockbase"

blockbase/readme.txt

@@ -19,6 +19,9 @@ Read the release notes at https://blockbasetheme.com/category/release-notes/
 
 == Changelog ==
 
+= 3.1.14 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 3.1.13 =
 * Replace experimental-link-color with link-color (#7221)
 

blockbase/style.css

@@ -7,11 +7,11 @@ Description: Blockbase is a simple theme that supports full-site editing. It com
 Requires at least: 6.1
 Tested up to: 6.1
 Requires PHP: 5.7
-Version: 3.1.13
+Version: 3.1.14
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: blockbase
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage, style-variations
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, style-variations
 
 Blockbase WordPress Theme, (C) 2021 Automattic, Inc.
 Blockbase is distributed under the terms of the GNU GPL.

brompton/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "brompton",
-	"version": "1.4.25",
+	"version": "1.4.27",
 	"description": "Brompton",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

brompton/sass/style-child-theme.scss

@@ -5,13 +5,13 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Status: inactive
 Template: varia
 Text Domain: brompton
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, jetpack-global-styles
 AMP: true
 
 This theme, like WordPress, is licensed under the GPL.

brompton/style-rtl.css

@@ -6,13 +6,13 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Status: inactive
 Template: varia
 Text Domain: brompton
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, jetpack-global-styles
 AMP: true
 
 This theme, like WordPress, is licensed under the GPL.

brompton/style.css

@@ -6,13 +6,13 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Running a business is no small task. But with the right tools and support, creating a website doesn’t have to be another chore on your to-do list: enter Brompton, a simple yet powerful theme for small-business owners and entrepreneurs.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Status: inactive
 Template: varia
 Text Domain: brompton
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage, jetpack-global-styles
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, jetpack-global-styles
 AMP: true
 
 This theme, like WordPress, is licensed under the GPL.

bsoj/readme.txt

@@ -1,7 +1,7 @@
 === BSoJ ===
 Contributors: Automattic
 Requires at least: 6.1
-Tested up to: 6.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
@@ -12,6 +12,9 @@ BSoJ (Blue Screen of Joy) is a blog theme inspired by the infamous Blue Screen o
 
 == Changelog ==
 
+= 1.0.2 =
+* BSoJ: Prepare for dotorg submission (#7321)
+
 = 1.0.1 =
 * BSoJ: Fix text domain in the footer
 

bsoj/style.css

@@ -2,17 +2,17 @@
 Theme Name: BSoJ
 Theme URI: https://wordpress.com/theme/bsoj
 Author: Automattic
-Author URI: https://automattic.com
+Author URI: https://automattic.com/
 Description: BSoJ (Blue Screen of Joy) is a blog theme inspired by the infamous Blue Screen of Death.
 Requires at least: 6.1
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: 
 Text Domain: bsoj
-Tags: blog, one-column, wide-blocks, block-patterns, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
+Tags: blog, one-column, wide-blocks, block-patterns, featured-images, full-site-editing, rtl-language-support, threaded-comments, translation-ready
 */
 
 /*

calm-business/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "calm-business",
-	"version": "1.6.9",
+	"version": "1.6.10",
 	"description": "Style Variation of the Default WP Theme",
 	"devDependencies": {
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"rtlcss": "^4.1.0"

calm-business/style-rtl.css

@@ -7,7 +7,7 @@ Author URI: https://wordpress.com
 Template: twentynineteen
 Description: Your classy establishment needs an equally classy website to showcase your stylish rooms and quality products! With its bold typography and peaceful color scheme, Calm Business exudes a calm, inviting atmosphere as a bed and breakfast, time share, or brick & mortar store fronts.
 Requires at least: WordPress 4.9.6
-Version: 1.6.9
+Version: 1.6.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: calm-business

calm-business/style.css

@@ -7,7 +7,7 @@ Author URI: https://wordpress.com
 Template: twentynineteen
 Description: Your classy establishment needs an equally classy website to showcase your stylish rooms and quality products! With its bold typography and peaceful color scheme, Calm Business exudes a calm, inviting atmosphere as a bed and breakfast, time share, or brick & mortar store fronts.
 Requires at least: WordPress 4.9.6
-Version: 1.6.9
+Version: 1.6.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: calm-business

calm-business/style.scss

@@ -6,7 +6,7 @@ Author URI: https://wordpress.com
 Template: twentynineteen
 Description: Your classy establishment needs an equally classy website to showcase your stylish rooms and quality products! With its bold typography and peaceful color scheme, Calm Business exudes a calm, inviting atmosphere as a bed and breakfast, time share, or brick & mortar store fronts.
 Requires at least: WordPress 4.9.6
-Version: 1.6.9
+Version: 1.6.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: calm-business

common/readme.txt

@@ -12,6 +12,9 @@ Common\'s style is anything but ordinary and it speaks for itself. The unique co
 
 == Changelog ==
 
+= 1.0.2 =
+* Remove tags blog-homepage and auto-loading-homepage (#7322)
+
 = 1.0.1 =
 * Common: removing unused pattern
 * Common: removing theme key from template part links on templates

common/style.css

@@ -7,11 +7,11 @@ Description: Common\'s style is anything but ordinary and it speaks for itself.
 Requires at least: 5.8
 Tested up to: 6.2
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: common
-Tags: blog, photography, portfolio, grid-layout, one-column, three-columns, four-columns, wide-blocks, block-patterns, custom-colors, custom-header, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, template-editing, theme-options, threaded-comments, translation-ready, one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage
+Tags: blog, photography, portfolio, grid-layout, one-column, three-columns, four-columns, wide-blocks, block-patterns, custom-colors, custom-header, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, template-editing, theme-options, threaded-comments, translation-ready, one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks
 */
 
 /*
@@ -32,4 +32,4 @@ Tags: blog, photography, portfolio, grid-layout, one-column, three-columns, four
 a {
 	text-decoration-thickness: .0625em !important;
 	text-underline-offset: .15em;
-}
+}

cortado/parts/header-inverted.html

@@ -1,5 +1,5 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:spacer {"height":"2rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","bottom":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:spacer {"height":"2rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 <div style="margin-top:0px;margin-bottom:0px;height:2rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 

cortado/patterns/footer.php

@@ -21,7 +21,7 @@
 				/* Translators: WordPress link. */
 				$wordpress_link = '<a href="' . esc_url( __( 'https://wordpress.org', 'cortado' ) ) . '" rel="nofollow">WordPress</a>';
 				echo sprintf(
-					// Translators: WordPress link.
+					/* Translators: Designed with WordPress text. */
 					esc_html__( 'Designed with %1$s', 'cortado' ),
 					$wordpress_link
 				);

cortado/patterns/front-page.php

@@ -6,9 +6,8 @@
  * Inserter: no
  */
 ?>
-
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px","right":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:spacer {"height":"8rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 <div style="margin-top:0px;margin-bottom:0px;height:8rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -45,8 +44,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px","right":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:spacer {"height":"8rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 <div style="margin-top:0px;margin-bottom:0px;height:8rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -340,3 +339,4 @@
 <!-- /wp:spacer --></div>
 <!-- /wp:group --></div>
 <!-- /wp:group -->
+

cortado/patterns/hero-inverted.php

@@ -6,12 +6,11 @@
  * Inserter: no
  */
 ?>
-
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"40px","left":"40px"}}}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","bottom":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"40px","left":"40px"}}}} -->
 <div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"50%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:heading {"level":1,"style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"textColor":"background"} -->
-<h1 class="wp-block-heading has-background-color has-text-color has-link-color"><?php echo esc_html__( 'Delicious', 'cortado' ); ?><br><?php echo esc_html__( 'food & coffee', 'cortado' ); ?><br><?php echo esc_html__( 'plus a vibrant', 'cortado' ); ?> <br><?php echo esc_html__( 'community', 'cortado' ); ?></h1>
+<h1 class="wp-block-heading has-background-color has-text-color has-link-color"><?php echo esc_html__( 'Delicious food & coffee plus a vibrant  community', 'cortado' ); ?></h1>
 <!-- /wp:heading --></div>
 <!-- /wp:column -->
 
@@ -26,11 +25,11 @@
 <div style="margin-top:0px;margin-bottom:0px;height:2rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"40px","left":"40px"},"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
-<div class="wp-block-columns are-vertically-aligned-center" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:column {"verticalAlignment":"center","width":"50%","style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
+<!-- wp:columns {"verticalAlignment":"center","isStackedOnMobile":false,"style":{"spacing":{"blockGap":{"top":"40px","left":"40px"},"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
+<div class="wp-block-columns are-vertically-aligned-center is-not-stacked-on-mobile" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:column {"verticalAlignment":"center","width":"50%","style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
 <div class="wp-block-column is-vertically-aligned-center" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px;flex-basis:50%"><!-- wp:buttons -->
-<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"background","textColor":"primary","style":{"typography":{"textTransform":"uppercase","letterSpacing":"0.1rem"},"border":{"radius":"2px"}}} -->
-<div class="wp-block-button" style="letter-spacing:0.1rem;text-transform:uppercase"><a class="wp-block-button__link has-primary-color has-background-background-color has-text-color has-background wp-element-button" href="<?php echo esc_url( home_url( '/' ) ); ?>" style="border-radius:2px"><?php echo esc_html__( 'Order online', 'cortado' ); ?></a></div>
+<div class="wp-block-buttons"><!-- wp:button {"backgroundColor":"background","textColor":"primary","style":{"typography":{"textTransform":"uppercase"}}} -->
+<div class="wp-block-button" style="text-transform:uppercase"><a class="wp-block-button__link has-primary-color has-background-background-color has-text-color has-background wp-element-button" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php echo esc_html__( 'Order Now', 'cortado' ); ?></a></div>
 <!-- /wp:button --></div>
 <!-- /wp:buttons --></div>
 <!-- /wp:column -->
@@ -39,7 +38,7 @@
 <div class="wp-block-column is-vertically-aligned-center" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px;flex-basis:50%"><!-- wp:columns {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":{"top":"20px","left":"20px"}}}} -->
 <div class="wp-block-columns" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:column {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
 <div class="wp-block-column" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:paragraph -->
-<p><?php echo esc_html__( 'Everyday', 'cortado' ); ?>&nbsp;<?php echo esc_html__( '7am - 6pm', 'cortado' ); ?><br><?php echo esc_html__( '617 000 0000', 'cortado' ); ?></p>
+<p><?php echo esc_html__( 'Everyday 7 am - 6 pm', 'cortado' ); ?><br><?php echo esc_html__( '617 000 0000', 'cortado' ); ?></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:column -->
 

cortado/patterns/hero.php

@@ -6,12 +6,12 @@
  * Inserter: no
  */
 ?>
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px","right":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"40px","left":"40px"}}}} -->
 <div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"50%"} -->
 <div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:heading {"level":1} -->
-<h1 class="wp-block-heading"><?php echo esc_html__( 'Delicious', 'cortado' ); ?><br><?php echo esc_html__( 'food & coffee', 'cortado' ); ?><br><?php echo esc_html__( 'plus a vibrant', 'cortado' ); ?> <br><?php echo esc_html__( 'community', 'cortado' ); ?></h1>
+<h1 class="wp-block-heading"><?php echo esc_html__( 'Delicious', 'cortado' ); ?><br><?php echo esc_html__( 'food & coffee', 'cortado' ); ?><br><?php echo esc_html__( 'plus a vibrant', 'cortado' ); ?><br><?php echo esc_html__( 'community', 'cortado' ); ?></h1>
 <!-- /wp:heading --></div>
 <!-- /wp:column -->
 
@@ -39,7 +39,7 @@
 <div class="wp-block-column is-vertically-aligned-center" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px;flex-basis:50%"><!-- wp:columns {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":{"top":"20px","left":"20px"}}}} -->
 <div class="wp-block-columns" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:column {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} -->
 <div class="wp-block-column" style="padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:paragraph -->
-<p><?php echo esc_html__( 'Everyday', 'cortado' ); ?>&nbsp;<?php echo esc_html__( '7am - 6pm', 'cortado' ); ?><br><?php echo esc_html__( '617 000 0000', 'cortado' ); ?></p>
+<p><?php echo esc_html__( 'Everyday 7am - 6pm', 'cortado' ); ?><br><?php echo esc_html__( '617 000 0000', 'cortado' ); ?></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:column -->
 

cortado/patterns/wp-custom-template-home-alt.php

@@ -7,8 +7,8 @@
  */
 ?>
 
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px","right":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"primary","textColor":"background","layout":{"type":"constrained"}} -->
+<div class="wp-block-group has-background-color has-primary-background-color has-text-color has-background has-link-color" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:spacer {"height":"8rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 <div style="margin-top:0px;margin-bottom:0px;height:8rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
@@ -45,8 +45,8 @@
 <!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px","right":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"0px","top":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-bottom:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0px"}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:spacer {"height":"8rem","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}}}} -->
 <div style="margin-top:0px;margin-bottom:0px;height:8rem" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->

cortado/readme.txt

@@ -12,6 +12,9 @@ Cortado is a simple and elegant theme. Its colors and typography work together p
 
 == Changelog ==
 
+= 1.0.1 =
+* Cortado: update theme templates (#7269)
+
 = 1.0.0 =
 * Initial release
 

cortado/style.css

@@ -7,7 +7,7 @@ Description: Cortado is a simple and elegant theme. Its colors and typography wo
 Requires at least: 6.0
 Tested up to: 6.2.2
 Requires PHP: 5.7
-Version: 1.0.0
+Version: 1.0.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: cortado

cortado/theme.json

@@ -1,9 +1,176 @@
 {
 	"settings": {
 		"appearanceTools": true,
+		"blocks": {
+			"core/button": {
+				"appearanceTools": true,
+				"color": {
+					"background": true,
+					"custom": true,
+					"customDuotone": true,
+					"customGradient": true,
+					"defaultDuotone": true,
+					"defaultGradients": true,
+					"defaultPalette": true,
+					"duotone": [],
+					"gradients": [],
+					"palette": [
+						{
+							"color": "#0a2bd7",
+							"name": "Primary",
+							"slug": "primary"
+						},
+						{
+							"color": "#0a2bd7",
+							"name": "Secondary",
+							"slug": "secondary"
+						},
+						{
+							"color": "#0a2bd7",
+							"name": "Foreground",
+							"slug": "foreground"
+						},
+						{
+							"color": "#fafafa",
+							"name": "Background",
+							"slug": "background"
+						},
+						{
+							"color": "#fafafa",
+							"name": "Tertiary",
+							"slug": "tertiary"
+						}
+					],
+					"text": true
+				},
+				"layout": {
+					"contentSize": false,
+					"wideSize": false
+				},
+				"shadow": {
+					"defaultPresets": true,
+					"presets": []
+				},
+				"spacing": {
+					"customSpacingSize": true,
+					"spacingScale": {
+						"increment": 1.5,
+						"mediumStep": 1.5,
+						"operator": "*",
+						"steps": 7,
+						"unit": "rem"
+					},
+					"spacingSizes": [],
+					"units": [
+						"%",
+						"px",
+						"em",
+						"rem",
+						"vh",
+						"vw"
+					]
+				},
+				"typography": {
+					"customFontSize": true,
+					"dropCap": true,
+					"fluid": true,
+					"fontFamilies": [
+						{
+							"fontFace": [
+								{
+									"fontFamily": "Plus Jakarta Sans",
+									"fontStyle": "normal",
+									"fontWeight": "300",
+									"src": [
+										"file:./assets/fonts/plus-jakarta-sans_300.ttf"
+									]
+								},
+								{
+									"fontFamily": "Plus Jakarta Sans",
+									"fontStyle": "normal",
+									"fontWeight": "600",
+									"src": [
+										"file:./assets/fonts/plus-jakarta-sans_600.ttf"
+									]
+								},
+								{
+									"fontFamily": "Plus Jakarta Sans",
+									"fontStyle": "italic",
+									"fontWeight": "300",
+									"src": [
+										"file:./assets/fonts/plus-jakarta-sans_300italic.ttf"
+									]
+								},
+								{
+									"fontFamily": "Plus Jakarta Sans",
+									"fontStyle": "italic",
+									"fontWeight": "600",
+									"src": [
+										"file:./assets/fonts/plus-jakarta-sans_600italic.ttf"
+									]
+								}
+							],
+							"fontFamily": "Plus Jakarta Sans",
+							"slug": "plus-jakarta-sans"
+						}
+					],
+					"fontSizes": [
+						{
+							"fluid": {
+								"max": "1.0625rem",
+								"min": "0.825rem"
+							},
+							"name": "Small",
+							"size": "1rem",
+							"slug": "small"
+						},
+						{
+							"fluid": {
+								"max": "1.25rem",
+								"min": "1rem"
+							},
+							"name": "Medium",
+							"size": "1.125rem",
+							"slug": "medium"
+						},
+						{
+							"fluid": {
+								"max": "2rem",
+								"min": "1.75rem"
+							},
+							"name": "Large",
+							"size": "1.75rem",
+							"slug": "large"
+						},
+						{
+							"fluid": {
+								"max": "3rem",
+								"min": "2.5rem"
+							},
+							"name": "Extra Large",
+							"size": "3rem",
+							"slug": "x-large"
+						}
+					],
+					"fontStyle": true,
+					"fontWeight": true,
+					"letterSpacing": true,
+					"textDecoration": true,
+					"textTransform": true
+				},
+				"useRootPaddingAwareAlignments": true
+			}
+		},
 		"color": {
+			"background": true,
 			"custom": true,
+			"customDuotone": true,
 			"customGradient": true,
+			"defaultDuotone": true,
+			"defaultGradients": true,
+			"defaultPalette": true,
+			"duotone": [],
+			"gradients": [],
 			"palette": [
 				{
 					"color": "#0a2bd7",
@@ -30,13 +197,27 @@
 					"name": "Tertiary",
 					"slug": "tertiary"
 				}
-			]
+			],
+			"text": true
 		},
 		"layout": {
 			"contentSize": "920px",
 			"wideSize": "1200px"
 		},
+		"shadow": {
+			"defaultPresets": true,
+			"presets": []
+		},
 		"spacing": {
+			"customSpacingSize": true,
+			"spacingScale": {
+				"increment": 1.5,
+				"mediumStep": 1.5,
+				"operator": "*",
+				"steps": 7,
+				"unit": "rem"
+			},
+			"spacingSizes": [],
 			"units": [
 				"%",
 				"px",
@@ -48,6 +229,7 @@
 		},
 		"typography": {
 			"customFontSize": true,
+			"dropCap": true,
 			"fluid": true,
 			"fontFamilies": [
 				{
@@ -126,12 +308,32 @@
 					"size": "3rem",
 					"slug": "x-large"
 				}
-			]
+			],
+			"fontStyle": true,
+			"fontWeight": true,
+			"letterSpacing": true,
+			"textDecoration": true,
+			"textTransform": true
 		},
 		"useRootPaddingAwareAlignments": true
 	},
 	"styles": {
 		"blocks": {
+			"core/button": {
+				"spacing": {
+					"padding": {
+						"bottom": "1.2rem",
+						"left": "2rem",
+						"right": "2rem",
+						"top": "1.2rem"
+					}
+				},
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"letterSpacing": "0.04rem",
+					"lineHeight": "1"
+				}
+			},
 			"core/code": {
 				"border": {
 					"color": "var(--wp--preset--color--foreground)",
@@ -346,7 +548,7 @@
 			},
 			"h1": {
 				"typography": {
-					"fontSize": "3.6rem",
+					"fontSize": "4rem",
 					"fontStyle": "normal",
 					"fontWeight": "300"
 				}
@@ -405,10 +607,10 @@
 		"spacing": {
 			"blockGap": "1.5rem",
 			"padding": {
-				"bottom": "0px",
-				"left": "var(--wp--preset--spacing--50)",
-				"right": "var(--wp--preset--spacing--50)",
-				"top": "0px"
+				"bottom": "0rem",
+				"left": "1.5rem",
+				"right": "1.5rem",
+				"top": "0rem"
 			}
 		},
 		"typography": {

course/functions.php

@@ -92,6 +92,17 @@ add_filter(
 	3
 );
 
+/**
+ * Filter the list of templates for the single lesson page.
+ *
+ * @param array   $page_templates Array of page templates.
+ * @param string  $theme          The current theme.
+ * @param WP_Post $post           The post being edited, provided for context, or null.
+ *
+ * @since Course 1.3.2
+ *
+ * @return array Array of page templates.
+ */
 function course_theme_filter_single_lesson_template_for_sensei_learning_mode( $page_templates, $theme, $post ) {
 	// In case some other plugin has a post type called lesson.
 	if ( ! $post || ! class_exists( 'Sensei_Main' ) ) {

course/patterns/comments.php

@@ -8,42 +8,41 @@
 ?>
 
 <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-<div class="wp-block-comments wp-block-comments-query-loop">
-<!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
+<div class="wp-block-comments wp-block-comments-query-loop"><!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-css-opacity is-style-wide"/>
+	<!-- /wp:separator -->
 
-<!-- wp:comment-template -->
-<!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-<div class="wp-block-group"><!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
+	<!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1"},"spacing":{"padding":{"top":"0","right":"0","bottom":"0px","left":"0"},"margin":{"top":"0","right":"0","left":"0"}}},"fontSize":"large"} /-->
 
-<!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:comment-author-name /-->
+	<!-- wp:comment-template {"style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"},"margin":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
+	<!-- wp:group {"style":{"spacing":{"padding":{"top":"0","right":"0","left":"0","bottom":"0"},"blockGap":"0","margin":{"bottom":"5rem"}}},"layout":{"type":"flex","orientation":"vertical","flexWrap":"wrap"}} -->
+	<div class="wp-block-group" style="margin-bottom:5rem;padding-top:0;padding-right:0;padding-bottom:0rem;padding-left:0"><!-- wp:group {"style":{"spacing":{"blockGap":"20px","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
+		<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:avatar {"size":48,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
 
-<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-<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:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
+			<div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:comment-author-name {"isLink":false} /-->
 
-<!-- wp:comment-edit-link /--></div>
-<!-- /wp:group -->
+				<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
+				<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px"><!-- wp:comment-date {"format":"F j, Y \\a\\t g:i a","isLink":false} /-->
 
-<!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
+					<!-- wp:comment-edit-link /--></div>
+				<!-- /wp:group -->
 
-<!-- wp:comment-reply-link /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
+				<!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
 
-<!-- wp:spacer {"height":"5rem"} -->
-<div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer --></div>
-<!-- /wp:group -->
-<!-- /wp:comment-template -->
+				<!-- wp:comment-reply-link /--></div>
+			<!-- /wp:group --></div>
+		<!-- /wp:group --></div>
+	<!-- /wp:group -->
+	<!-- /wp:comment-template -->
 
-<!-- wp:comments-pagination -->
-<!-- wp:comments-pagination-previous /-->
+	<!-- wp:comments-pagination -->
+	<!-- wp:comments-pagination-previous /-->
 
-<!-- wp:comments-pagination-numbers /-->
+	<!-- wp:comments-pagination-numbers /-->
 
-<!-- wp:comments-pagination-next /-->
-<!-- /wp:comments-pagination -->
+	<!-- wp:comments-pagination-next /-->
+	<!-- /wp:comments-pagination -->
 
-<!-- wp:post-comments-form /--></div>
-<!-- /wp:comments -->
+	<!-- wp:post-comments-form /--></div>
+<!-- /wp:comments -->

course/readme.txt

@@ -1,17 +1,21 @@
 === Course ===
 Contributors: Automattic
 Requires at least: 6.2
-Tested up to: 6.2
-Requires PHP: 7.2
+Tested up to: 6.3
+Requires PHP: 7.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
 
-Course is a flexible and modern theme for anyone wanting to share their knowledge. The theme is built with integration with Sensei LMS and is ideal for Sensei users that are creating or selling courses. Style variations with multiple font and color combinations help you craft the perfect look and feel to show off courses and content. The theme can be used without Sensei too.
+Course is a flexible and modern education theme for anyone wanting to share their knowledge. The theme is built with integration with Sensei LMS and is ideal for Sensei users that are creating or selling courses. Style variations with multiple font and color combinations help you craft the perfect look and feel to show off courses and content. The theme can be used without Sensei too.
 
 == Changelog ==
 
+= 1.3.2 =
+* Update comment styles (#7252)
+* Add single lesson template for improved Sensei support (#7265)
+
 = 1.3.1 =
 * Add the style-variations tag to themes with style variations (#7199)
 
@@ -30,7 +34,7 @@ Course is a flexible and modern theme for anyone wanting to share their knowledg
 = 1.2.4 =
 * Tweak some block styles (#7033)
 * Add body class for the theme variation (#7034)
-* Course: Skip the learning mode style when sensei is not available (#7031)
+* Skip the learning mode style when sensei is not available (#7031)
 
 = 1.2.3 =
 * Update colors and typography of default Learning Mode template (#7008)

course/style.css

@@ -3,10 +3,10 @@ Theme Name: Course
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Course is a flexible and modern theme for anyone wanting to share their knowledge. The theme is built with integration with Sensei LMS and is ideal for Sensei users that are creating or selling courses. Style variations with multiple font and color combinations help you craft the perfect look and feel to show off courses and content. The theme can be used without Sensei too.
-Version: 1.3.1
+Version: 1.3.2
 Requires at least: 6.2
-Tested up to: 6.2
-Requires PHP: 7.2
+Tested up to: 6.3
+Requires PHP: 7.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: course
@@ -127,17 +127,94 @@ h1, h2, h3, h4, h5, h6 {
 /*
  * Comments
  */
+
+.wp-block-comments-query-loop .wp-block-post-comments-form:not(last-child) {
+	margin-bottom: var(--wp--custom--comment-gap);
+}
+
+.comment-reply-title a {
+	font-size: var(--wp--preset--font-size--x-small);
+}
+
+.wp-block-comments-query-loop .wp-block-comments-pagination {
+	margin-top: calc( var(--wp--custom--comment-gap) / 2 * -1 );
+	margin-bottom: var(--wp--custom--comment-gap);
+}
+
+.wp-block-comments-query-loop hr,
+.wp-block-comments-query-loop .wp-block-comments-title {
+	margin-bottom: clamp(2.5rem, 2.167rem + 1.111vw, 3rem);
+}
+
+.wp-block-post-comments-form .comment-form-cookies-consent input[type="checkbox"] {
+	display: none;
+}
+
+.wp-block-post-comments-form .comment-form-cookies-consent input[type="checkbox"] + label:before {
+	border: 1px solid var(--wp--preset--color--foreground);
+	content: "\00a0";
+	display: inline-block;
+	font-size: 1rem;
+	height: 16px;
+	padding: 0;
+	vertical-align: center;
+	width: 16px;
+	border-radius: 4px;
+	margin-right: var(--wp--custom--comment-gap-small);
+}
+
+.wp-block-post-comments-form .comment-form-cookies-consent input[type="checkbox"]:checked + label:before {
+	color: green;
+	content: "\2713";
+	text-align: center;
+}
+
+
+.wp-block-post-comments-form h3.comment-reply-title {
+	margin-bottom: var(--wp--preset--spacing--60);
+}
+
+.wp-block-post-comments-form .comment-form-comment label {
+	display: inline-block;
+}
+
+.wp-block-post-comments-form .comment-form-comment label,
+.wp-block-post-comments-form .comment-form-author label,
+.wp-block-post-comments-form .comment-form-url label,
+.wp-block-post-comments-form .comment-form-email label
+{
+	margin-bottom: 5px;
+}
+
+.wp-block-post-comments-form form.comment-form .form-submit {
+	margin-top: var(--wp--preset--spacing--50);
+}
+
 .wp-block-post-comments-form form.comment-form p input:not([type=submit]),
 .wp-block-post-comments-form form.comment-form textarea {
 	border: 1px solid var(--wp--preset--color--foreground);
 	border-radius: 8px;
 	background-color: var(--wp--preset--color--background);
+	color: var(--wp--preset--color--foreground);
+	font-size: var(--wp--preset--font-size--x-small);
+	padding: 11px;
 }
 
 .wp-block-post-comments-form .comment-form-cookies-consent label {
 	margin: auto 0;
 }
 
+.wp-block-post-comments-form .comment-form-cookies-consent {
+	align-items: center;
+	gap: var(--wp--preset--spacing--30);
+}
+
+.wp-block-post-comments-form .comment-form-cookies-consent input {
+	transform: scale(1.3);
+	background-color: transparent;
+	accent-color: red;
+}
+
 .wp-block-post-comments-form .comment-form {
 	display: grid;
 	grid-template-columns: 1fr 1fr;
@@ -204,7 +281,6 @@ h1, h2, h3, h4, h5, h6 {
 
 .wp-block-comments-query-loop .comment > .is-vertical > .wp-block-group {
 	align-items: flex-start;
-	gap: var(--wp--custom--comment-gap-small);
 }
 
 .wp-block-comments-query-loop .comment > div > div > .is-vertical {

course/templates/page.html

@@ -14,59 +14,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single-column-featured-no-title.html

@@ -14,59 +14,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single-column-featured-title.html

@@ -16,59 +16,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single-column-no-featured-no-title.html

@@ -8,59 +8,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single-column-no-featured-title.html

@@ -14,59 +14,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single-course.html

@@ -14,59 +14,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/single.html

@@ -7,8 +7,8 @@
 <div class="wp-block-group"><!-- wp:post-title {"level":1,"align":"wide","style":{"typography":{"textTransform":"uppercase"}}} /--></div>
 <!-- /wp:group -->
 
-<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":true},"style":{"border":{"bottom":{"width":"1px"},"radius":"0px"},"spacing":{"margin":{"top":"2.5rem"}}}} -->
-<main class="wp-block-group" style="border-radius:0px;border-bottom-width:1px;margin-top:2.5rem">
+<!-- wp:group {"tagName":"main","lock":{"move":false,"remove":true},"style":{"border":{"radius":"0px"},"spacing":{"margin":{"top":"2.5rem"}}}} -->
+<main class="wp-block-group" style="border-radius:0px;margin-top:2.5rem">
     <!-- wp:post-featured-image /-->
     
     <!-- wp:columns {"style":{"spacing":{"blockGap":{"top":"0px","left":"0px"},"margin":{"bottom":"40px"}}}} -->

course/templates/wide-featured-no-title.html

@@ -14,59 +14,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/wide-featured-title.html

@@ -16,59 +16,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/templates/wide-no-featured-no-title.html

@@ -8,59 +8,7 @@
   <div class="wp-block-group">
     <!-- wp:group {"layout":{"type":"constrained"}} -->
     <div class="wp-block-group">
-      <!-- wp:comments {"className":"wp-block-comments-query-loop "} -->
-      <div class="wp-block-comments wp-block-comments-query-loop">
-        <!-- wp:separator {"opacity":"css","className":"is-style-wide"} -->
-        <hr class="wp-block-separator has-css-opacity is-style-wide" />
-        <!-- /wp:separator -->
-
-        <!-- wp:comments-title {"showPostTitle":false,"showCommentsCount":false,"level":3,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"large"} /-->
-
-        <!-- wp:comment-template -->
-        <!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
-        <div class="wp-block-group">
-          <!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left","verticalAlignment":"top"}} -->
-          <div class="wp-block-group">
-            <!-- wp:avatar {"size":40,"style":{"border":{"radius":"24px","width":"1px"}}} /-->
-
-            <!-- wp:group {"style":{"spacing":{"blockGap":"0","padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"flex","orientation":"vertical"}} -->
-            <div class="wp-block-group" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
-              <!-- wp:comment-author-name /-->
-
-              <!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5em"}},"layout":{"type":"flex","verticalAlignment":"bottom"}} -->
-              <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 -->
-
-              <!-- wp:comment-content {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"}}}} /-->
-
-              <!-- wp:comment-reply-link /-->
-            </div>
-            <!-- /wp:group -->
-          </div>
-          <!-- /wp:group -->
-
-          <!-- wp:spacer {"height":"5rem"} -->
-          <div style="height:5rem" aria-hidden="true" class="wp-block-spacer"></div>
-          <!-- /wp:spacer -->
-        </div>
-        <!-- /wp:group -->
-        <!-- /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 -->
+      <!-- wp:pattern {"slug":"course/comments"} /-->
     </div>
     <!-- /wp:group -->
   </div>

course/theme.json

@@ -402,7 +402,12 @@
 				"elements": {
 					"heading": {
 						"typography": {
-							"fontSize": "var(--wp--custom--typography--font-sizes--normal)"
+							"fontSize": "var(--wp--custom--typography--font-sizes--normal)",
+							"fontFamily": "var(--wp--preset--font-family--system)",
+							"textTransform": "none",
+							"fontWeight": "600",
+							"letterSpacing": "-0.24px",
+							"lineHeight": "100%"
 						}
 					},
 					"button": {
@@ -417,6 +422,12 @@
 							"fontFamily": "var(--wp--preset--font-family--heading)",
 							"fontSize": "var(--wp--custom--typography--font-sizes--button)",
 							"lineHeight": "100%"
+						},
+						"spacing": {
+							"padding": {
+								"top": "1.125rem",
+								"bottom": "1.125rem"
+							}
 						}
 					}
 				}

coutoire/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "coutoire",
-	"version": "1.4.25",
+	"version": "1.4.26",
 	"description": "Coutoire",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

coutoire/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

coutoire/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: A design system for WordPress sites built with Gutenberg.
 Requires at least: WordPress 4.9.6
-Version: 1.4.25
+Version: 1.4.26
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

creatio/readme.txt

@@ -12,6 +12,12 @@ Creatio is a simple, minimal theme that supports full-site editing and global st
 
 == Changelog ==
 
+= 1.0.3 =
+* Creatio - Remove blockGap between first-level patterns (#7288)
+
+= 1.0.2 =
+* Update theme.json (#7276)
+
 = 1.0.1 =
 * Update readme.txt (#7261)
 

creatio/style.css

@@ -7,7 +7,7 @@ Description: Creatio is a simple, minimal theme that supports full-site editing
 Requires at least: 6.1
 Tested up to: 6.2
 Requires PHP: 5.7
-Version: 1.0.1
+Version: 1.0.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: creatio
@@ -56,20 +56,3 @@ a {
 	text-decoration-thickness: .0625em !important;
 	text-underline-offset: .15em;
 }
-
-/**
- * Remove blockGap between header/sections/footer for Pattern Assembler.
- * See https://github.com/Automattic/wp-calypso/issues/78097 for reference. 
- */
-
-/* Remove the gap from the editor. */
-.editor-styles-wrapper :where(.wp-site-blocks) > * {
-    margin-block-start: 0;
-    margin-block-end: 0;
-}
-
-/* Remove the gap from the front-end. */
-:where(.wp-site-blocks) > * {
-    margin-block-start: 0;
-    margin-block-end: 0;
-}

creatio/theme.json

@@ -57,7 +57,38 @@
 				"steps": 7,
 				"unit": "rem"
 			},
-			"spacingSizes": [],
+			"spacingSizes": [
+				{
+					"name": "1",
+					"size": "0.5rem",
+					"slug": "30"
+				},
+				{
+					"name": "2",
+					"size": "1rem",
+					"slug": "40"
+				},
+				{
+					"name": "3",
+					"size": "clamp(1.5rem, 2.4096386vw, 2.0rem)",
+					"slug": "50"
+				},
+				{
+					"name": "4",
+					"size": "clamp(1.5rem, 3.6144578vw, 3.0rem)",
+					"slug": "60"
+				},
+				{
+					"name": "5",
+					"size": "clamp(2.0rem, 4.8192771vw, 4.0rem)",
+					"slug": "70"
+				},
+				{
+					"name": "6",
+					"size": "clamp(3.0rem, 7.2289157vw, 6.0rem)",
+					"slug": "80"
+				}
+			],
 			"units": [
 				"%",
 				"px",
@@ -216,6 +247,7 @@
 		"useRootPaddingAwareAlignments": true
 	},
 	"styles": {
+		"css": "\/* Remove block gap between first-level blocks *\/ :where(.wp-site-blocks) > * { margin-block-start: 0; margin-block-end: 0; }",
 		"blocks": {
 			"core/button": {
 				"border": {

dalston/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dalston",
-	"version": "1.3.26",
+	"version": "1.3.27",
 	"description": "Dalston",
 	"bugs": {
 		"url": "https://github.com/Automattic/themes/issues"
@@ -10,7 +10,7 @@
 		"@wordpress/browserslist-config": "^5.16.0",
 		"autoprefixer": "^10.4.2",
 		"chokidar-cli": "^3.0.0",
-		"node-sass": "^8.0.0",
+		"node-sass": "^7.0.3",
 		"npm-run-all": "^4.1.5",
 		"postcss-cli": "^10.1.0",
 		"postcss-focus-within": "^7.0.2",

dalston/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

dalston/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

dalston/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Make your online portfolio impressively awesome with Dalston. With the ability to beautifully highlight your illustration and other projects, Dalston is also versatile enough to be your personal site too.
 Requires at least: WordPress 4.9.6
-Version: 1.3.26
+Version: 1.3.27
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia