Merge branch 'trunk' into archeo/footer-spacing

archeo/inc/patterns/image-with-description.php

@@ -23,7 +23,7 @@
 	<p class="has-small-font-size" style="font-style:italic;font-weight:400">' . __( 'From "American Cities and Ruins: Mitla, Palenqué, Izamal, Chichen-Itza, Uxmal, Atlas" housed at the New York Public Library.', 'archeo' ) . '</p>
 	<!-- /wp:paragraph -->
 
-	<!-- wp:image {"id":840,"sizeSlug":"full","linkDestination":"none"} -->
+	<!-- wp:image {"sizeSlug":"full","linkDestination":"none"} -->
 	<figure class="wp-block-image size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/ancien-temple.jpg" alt="' . __( 'Photo of ancient temple, at Chichen-Itza', 'archeo' ) . '"/></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column --></div>

archeo/inc/patterns/image-with-headline-description.php

@@ -6,8 +6,8 @@
 	'title'      => __( 'Image with headline and description', 'archeo' ),
 	'categories' => array( 'featured', 'images' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"0","right":"5vw","bottom":"0","left":"5vw"}}}} -->
-	<div class="wp-block-group alignfull" style="padding-top:0;padding-right:5vw;padding-bottom:0;padding-left:5vw"><!-- wp:media-text {"mediaLink":"' . esc_url( get_template_directory_uri() ) . '/assets/images/chahk.png","mediaType":"image","mediaWidth":64,"verticalAlignment":"top"} -->
-	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:64% auto"><figure class="wp-block-media-text__media"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/chahk.png" alt="' . esc_attr__( 'Chahk: rain deity', 'archeo' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"right","style":{"typography":{"fontSize":"clamp(64px, 6vw, 100px)","lineHeight":"1","textTransform":"uppercase"},"spacing":{"margin":{"bottom":"48px"}}}} -->
+	<div class="wp-block-group alignfull" style="padding-top:0;padding-right:5vw;padding-bottom:0;padding-left:5vw"><!-- wp:media-text {"mediaLink":"' . esc_url( get_template_directory_uri() ) . '/assets/images/chahk.gif","mediaType":"image","mediaWidth":64,"verticalAlignment":"top"} -->
+	<div class="wp-block-media-text alignwide is-stacked-on-mobile is-vertically-aligned-top" style="grid-template-columns:64% auto"><figure class="wp-block-media-text__media"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/chahk.gif" alt="' . esc_attr__( 'Chahk: rain deity', 'archeo' ) . '"/></figure><div class="wp-block-media-text__content"><!-- wp:heading {"textAlign":"right","style":{"typography":{"fontSize":"clamp(64px, 6vw, 100px)","lineHeight":"1","textTransform":"uppercase"},"spacing":{"margin":{"bottom":"48px"}}}} -->
 	<h2 class="has-text-align-right" id="chahk-raindeity" style="font-size:clamp(64px, 6vw, 100px);line-height:1;margin-bottom:48px;text-transform:uppercase">' . wp_kses_post( __( 'Chahk:<br>Rain<br>deity', 'archeo' ) ) . '</h2>
 	<!-- /wp:heading -->
 

archeo/inc/patterns/layout-with-two-images-and-text.php

@@ -17,7 +17,7 @@
 	<!-- /wp:paragraph -->
 	
 	<!-- wp:image {"align":"left","sizeSlug":"full","linkDestination":"none"} -->
-	<div class="wp-block-image"><figure class="alignleft size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/pyramid.jpg" alt="' . __( 'Photograph by Désiré Charnay, 1862 to 1863', 'archeo' ) . '"/><figcaption><mark style="background-color:rgba(0, 0, 0, 0)" class="has-inline-color has-background-color"><em>' . __( 'Photograph by Désiré Charnay, 1862 – 1863', 'archeo' ) . '</em></mark></figcaption></figure></div>
+	<figure class="wp-block-image alignleft size-full"><img src="' . esc_url( get_template_directory_uri() ) . '/assets/images/pyramid.jpg" alt="' . __( 'Photograph by Désiré Charnay, 1862 to 1863', 'archeo' ) . '"/><figcaption><mark style="background-color:rgba(0, 0, 0, 0)" class="has-inline-color has-background-color"><em>' . __( 'Photograph by Désiré Charnay, 1862 – 1863', 'archeo' ) . '</em></mark></figcaption></figure>
 	<!-- /wp:image --></div>
 	<!-- /wp:column -->
 	

archeo/inc/patterns/simple-list-of-posts-with-background.php

@@ -7,16 +7,16 @@
 	'categories' => array( 'featured', 'query' ),
 	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var(--wp--custom--spacing--medium)","bottom":"var(--wp--custom--spacing--medium)"},"margin":{"top":"0px"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"foreground","textColor":"background"} -->
 	<div class="wp-block-group alignwide has-background-color has-foreground-background-color has-text-color has-background has-link-color" style="padding-top:var(--wp--custom--spacing--medium);padding-bottom:var(--wp--custom--spacing--medium);margin-top:0px">
-		<!-- wp:heading {"level":3,"style":{"spacing":{"margin":{"bottom":"60px"}}},"fontSize":"medium"} -->
-		<h3 class="has-medium-font-size" style="margin-bottom:60px">' . __( 'Selected Writings', 'archeo' ) . '</h3>
+		<!-- wp:heading {"level":3,"style":{"spacing":{"margin":{"bottom":"40px"}}},"fontSize":"medium"} -->
+		<h3 class="has-medium-font-size" style="margin-bottom:40px">' . __( 'Selected Writings', 'archeo' ) . '</h3>
 		<!-- /wp:heading -->
-		
+
 		<!-- wp:query {"queryId":3,"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"perPage":3}} -->
 		<div class="wp-block-query"><!-- wp:post-template -->
 		<!-- wp:group {"className":"simple-list-of-posts","layout":{"type":"flex","allowOrientation":false}} -->
-		<div class="wp-block-group simple-list-of-posts"><!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.2","fontStyle":"normal","fontWeight":"100"}},"fontSize":"huge"} /-->
+		<div class="wp-block-group simple-list-of-posts"><!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.2","fontStyle":"normal","fontWeight":"100"},"spacing":{"margin":{"top":"1.25rem"}}},"fontSize":"huge"} /-->
 		
-		<!-- wp:post-author-name {"style":{"typography":{"fontStyle":"normal","fontWeight":"100","lineHeight":"1.2"}},"fontSize":"medium"} /--></div>
+		<!-- wp:post-author-name {"style":{"typography":{"fontStyle":"normal","fontWeight":"100","lineHeight":"1.2"},"spacing":{"margin":{"top":"0px"}}},"fontSize":"medium"} /--></div>
 		<!-- /wp:group -->
 		<!-- /wp:post-template -->
 		<!-- wp:spacer {"height":"40px"} -->
@@ -28,4 +28,4 @@
 		<!-- /wp:query-pagination --></div>
 		<!-- /wp:query --></div>
 		<!-- /wp:group -->',
-);
+);

archeo/inc/patterns/simple-list-of-posts.php

@@ -9,9 +9,9 @@
 	<div class="wp-block-group alignwide" style="padding-top:var(--wp--custom--spacing--medium);padding-bottom:var(--wp--custom--spacing--medium);margin-top:0px"><!-- wp:query {"queryId":3,"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"perPage":3}} -->
 	<div class="wp-block-query"><!-- wp:post-template -->
 	<!-- wp:group {"className":"simple-list-of-posts","layout":{"type":"flex","allowOrientation":false}} -->
-	<div class="wp-block-group simple-list-of-posts"><!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.2","fontStyle":"normal","fontWeight":"100"}},"fontSize":"huge"} /-->
+	<div class="wp-block-group simple-list-of-posts"><!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.2","fontStyle":"normal","fontWeight":"100"},"spacing":{"margin":{"top":"1.25rem"}}},"fontSize":"huge"} /-->
 	
-	<!-- wp:post-author-name {"style":{"typography":{"fontStyle":"normal","fontWeight":"100","lineHeight":"1.2"}},"fontSize":"medium"} /--></div>
+	<!-- wp:post-author-name {"style":{"typography":{"fontStyle":"normal","fontWeight":"100","lineHeight":"1.2"},"spacing":{"margin":{"top":"0px"}}},"fontSize":"medium"} /--></div>
 	<!-- /wp:group -->
 	<!-- /wp:post-template -->
 	<!-- wp:spacer {"height":"40px"} -->

archeo/style.css

@@ -7,7 +7,7 @@ Description: A clean portfolio theme
 Requires at least: 5.8
 Tested up to: 5.9
 Requires PHP: 5.7
-Version: 0.0.9
+Version: 0.0.10
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: archeo
@@ -50,10 +50,11 @@ a {
 	text-decoration: none;
 }
 
-a:hover,
+a:hover:not(.wp-block-button__link),
 .wp-block-site-title a:hover,
 .wp-block-post-title a:hover,
 .wp-block-post-date a:hover {
+	text-decoration-line: underline;
 	text-decoration-style: dotted;
 }
 
@@ -67,7 +68,7 @@ a:active,
 .wp-block-navigation .wp-block-navigation-link a:hover,
 .wp-block-navigation .wp-block-page-list a:hover,
 .wp-block-navigation .wp-block-pages-list__item a:hover {
-	text-decoration: underline;
+	text-decoration-line: underline;
 }
 
 /*
@@ -177,7 +178,7 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 }
 
 /*
- * We need this until https://github.com/WordPress/gutenberg/issues/37035 is fixed.
+ * Needed until https://github.com/WordPress/gutenberg/issues/37035 is fixed.
  */
 .wp-block-navigation__responsive-container.is-menu-open ul {
 	font-size: var(--wp--preset--font-size--large) !important;
@@ -198,7 +199,7 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 }
 
 /*
- * We need this until https://github.com/WordPress/gutenberg/issues/38498 is fixed.
+ * Needed until https://github.com/WordPress/gutenberg/issues/38498 is fixed.
  */
 .wp-block-group.simple-list-of-posts {
 	align-items: baseline;
@@ -209,4 +210,24 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
  */
 .site-footer {
 	row-gap: 0.5rem !important;
-}
+}
+
+/*
+ * Needed until https://github.com/WordPress/gutenberg/pull/38986 is merged.
+ */
+.wp-block-post-title a {
+	text-decoration-line: none;
+}
+
+.wp-block-post-title a:hover {
+	text-decoration-line: underline;
+}
+
+/*
+ * Needed until there's a fix in GB.
+ * Related: https://github.com/WordPress/gutenberg/pull/39045
+ */
+.wp-block-image img {
+	height: auto;
+	max-width: 100%;
+}

blockbase/inc/customizer/wp-customize-colors.php

@@ -61,16 +61,8 @@ function build_user_color_palette() {
 			$user_color_palette = $theme_json['settings']['color']['palette']['custom'];
 		}
 
-		// NOTE: This should be removed once Gutenberg 12.1 lands stably in all environments
-		elseif ( isset( $theme_json['settings']['color']['palette']['user'] ) ) {
-			$user_color_palette = $theme_json['settings']['color']['palette']['user'];
-		}
-		// End Gutenberg < 12.1 compatibility patch
-
 		// Combine theme settings with user settings.
 		foreach ( $combined_color_palette as $key => $palette_item ) {
-			//make theme color value the default
-			$combined_color_palette[ $key ]['default'] = $combined_color_palette[ $key ]['color'];
 			//use user color value if there is one
 			$user_color_value = $this->get_user_color_value( $palette_item['slug'], $user_color_palette );
 			if ( isset( $user_color_value ) ) {
@@ -118,7 +110,6 @@ function register_color_control( $wp_customize, $palette_item ) {
 			$wp_customize,
 			$setting_key,
 			array(
-				'default'    => $palette_item['default'],
 				'user_value' => $palette_item['color'],
 			)
 		);
@@ -158,7 +149,10 @@ function handle_customize_save_after( $wp_customize ) {
 		$new_styles   = (array) $global_styles->data['styles'];
 
 		// Set the new color settings
-		$new_settings['color']['palette']['custom'] = $this->user_color_palette;
+		$new_settings['color']['palette']['theme'] = $this->user_color_palette;
+		// We used to set the values in 'custom' but moved to 'theme' to mirror GS functionality.
+		// This ensures that new saves don't store the customizations in both places.
+		unset($new_settings['color']['palette']['custom']);
 
 		// Add the updated global styles to the update request
 		$update_request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' );
@@ -174,14 +168,6 @@ function handle_customize_save_after( $wp_customize ) {
 		delete_transient( 'gutenberg_global_styles_' . get_stylesheet() );
 	}
 
-	function check_if_colors_are_default() {
-		foreach ( $this->user_color_palette as $palette_color ) {
-			if ( strtoupper( $palette_color['color'] ) !== strtoupper( $palette_color['default'] ) ) {
-				return false;
-			}
-		}
-		return true;
-	}
 }
 
 new GlobalStylesColorCustomizer;

blockbase/package.json

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

blockbase/style.css

@@ -7,7 +7,7 @@ Description: Blockbase is a simple theme that supports full-site editing. It com
 Requires at least: 5.7
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 2.0.25
+Version: 2.0.26
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: blockbase

karuna/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.com/themes/karuna/
 Author: Automattic
 Author URI: http://wordpress.com/themes/
 Description: Karuna is a clean business theme designed with health and wellness-focused sites in mind. With bright, bold colors, prominent featured images, and support for customer testimonials, your business' brand will shine with Karuna.
-Version: 1.2.12-wpcom
+Version: 1.2.13-wpcom
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: karuna
@@ -1486,7 +1486,9 @@ body {
 	margin: 0.8em 0 0;
 	padding: 0.8em 0 0;
 }
-.widget div > ol > li:first-of-type, .widget > ol > li:first-of-type {
+.widget div > ol > li:first-of-type,
+.widget > ol > li:first-of-type,
+.wp-block-social-links li.wp-social-link {
 	border-top: 0;
 	margin-top: 0;
 	padding-top: 0;

remote/style.css

@@ -7,7 +7,7 @@ Description:
 Requires at least: 5.8
 Tested up to: 5.9
 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
 Text Domain: archeo
@@ -196,6 +196,19 @@ a:not(
 	outline-offset: 3px;
 }
 
+/*
+ * Comment form styles
+ */
+
+ .wp-block-post-comments input:not([type=submit]):not([type=checkbox]),
+ .wp-block-post-comments textarea,
+ .wp-block-post-comments select {
+	 border-radius: var(--wp--custom--button--border--radius);
+	 background-color: var(--wp--preset--color--background);
+	 color: var(--wp--preset--color--foreground);
+	 border: 1px solid var(--wp--preset--color--foreground);
+ }
+
 /*
  * Needed until https://github.com/WordPress/gutenberg/issues/34196 or something like it.
  */

remote/theme.json

@@ -98,14 +98,6 @@
 				"color": {
 					"background": "var(--wp--preset--color--primary)",
 					"text": "var(--wp--preset--color--background)"
-				},
-				"spacing": {
-					"padding": {
-						"top": "0.375em",
-						"right": "0.625em",
-						"bottom": "0.375em",
-						"left": "0.625em"
-					}
 				}
 			},
 			"core/heading": {
@@ -122,6 +114,15 @@
 				"border": {
 					"color": "var(--wp--preset--color--primary)"
 				}
+			},
+			"core/post-comments": {
+				"elements": {
+					"h3": {
+						"typography": {
+							"fontSize": "var(--wp--preset--font-size--large)"
+						}
+					}
+				}
 			}
 		},
 		"color": {

skatepark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skatepark",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "",
   "main": "index.php",
   "devDependencies": {

skatepark/style.css

@@ -7,7 +7,7 @@ Description: Skatepark is a bold and exciting WordPress theme designed for moder
 Requires at least: 5.7.2
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.0.37
+Version: 1.0.38
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: skatepark

stewart/inc/block-patterns.php

@@ -14,10 +14,11 @@
  */
 function stewart_register_block_patterns() {
 	$block_pattern_categories = array(
-		'footer'   => array( 'label' => __( 'Footers', 'stewart' ) ),
-		'header'   => array( 'label' => __( 'Headers', 'stewart' ) ),
-		'pages'    => array( 'label' => __( 'Pages', 'stewart' ) ),
-		'sidebar'   => array( 'label' => __( 'Sidebars', 'stewart' ) ),
+		'footer'     => array( 'label' => __( 'Footers', 'stewart' ) ),
+		'header'     => array( 'label' => __( 'Headers', 'stewart' ) ),
+		'pages'      => array( 'label' => __( 'Pages', 'stewart' ) ),
+		'sidebar'    => array( 'label' => __( 'Sidebars', 'stewart' ) ),
+		'query'      => array( 'label' => __( 'Query', 'stewart' ) ),
 	);
 
 	/**
@@ -60,6 +61,7 @@ function stewart_register_block_patterns() {
 		'sidebar-introduction',
 		'sidebar-blogging',
 		'sidebar-categories-tags',
+		'posts-list',
 	);
 
 	/**

stewart/inc/patterns/posts-list.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Posts list pattern
+ */
+return array(
+	'title'      => __( 'Posts list', 'stewart' ),
+	'categories' => array( 'query' ),
+	'content'    => '<!-- wp:query {"queryId":3,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"list","columns":2},"layout":{"inherit":false}} -->
+    <div class="wp-block-query"><!-- wp:post-template -->
+    <!-- wp:post-title {"isLink":true,"style":{"typography":{"lineHeight":"1.2"}},"fontSize":"huge"} /-->
+    
+    <!-- wp:post-featured-image {"isLink":true} /-->
+    
+    <!-- wp:post-excerpt {"fontSize":"normal"} /-->
+    
+    <!-- wp:post-date {"isLink":true,"fontSize":"extra-small"} /-->
+    
+    <!-- wp:spacer {"height":"60px"} -->
+    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+    <!-- /wp:post-template -->
+    
+    <!-- wp:query-pagination -->
+    <div class="wp-block-query-pagination"><!-- wp:query-pagination-previous /-->
+    
+    <!-- wp:query-pagination-numbers /-->
+    
+    <!-- wp:query-pagination-next /--></div>
+    <!-- /wp:query-pagination --></div>
+    <!-- /wp:query -->',
+);

stewart/style.css

@@ -7,7 +7,7 @@ Description: Stewart is a modern blogging theme with a left sidebar. Its default
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 5.7
-Version: 1.3
+Version: 1.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: stewart