Merge branch 'trunk' into add/skatepark-testimonial-block-pattern

# Conflicts:
#	skatepark/assets/theme.css
#	skatepark/inc/block-styles.php
#	skatepark/sass/theme.scss

blockbase/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "blockbase",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

blockbase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockbase",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Blank Parent Theme",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

blockbase/readme.txt

@@ -35,6 +35,12 @@ A Universal theme is a theme that works in Full Site Editing and in the Customiz
 
 == Changelog ==
 
+= 1.2.0 =
+* Remove site editor toggle 
+* PHP 404 template
+* Revise font customization approach
+* Bug fixes and child-theme compability improvements 
+
 = 1.1.0 =
 * Added color customization from the customizer
 

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.7
 Requires PHP: 5.7
-Version: 1.1.2
+Version: 1.2.0
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Text Domain: blockbase

mayland-blocks/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "mayland-blocks",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

mayland-blocks/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mayland-blocks",
-	"version": "2.1.0",
+	"version": "2.1.1",
 	"description": "",
 	"main": "index.js",
 	"dependencies": {},

mayland-blocks/readme.txt

@@ -12,6 +12,10 @@ Mayland Blocks is a block theme based on the Mayland theme.
 
 == Changelog ==
 
+= 2.1.1 =
+* Better comments styles
+* Bug fixes and Gutenberg + Blockbase compatibility improvements
+
 = 2.1.0 =
 * Added color customization from the customizer
 

mayland-blocks/style.css

@@ -7,7 +7,7 @@ Description: Make your online portfolio wonderfully uncluttered with Mayland. Gr
 Requires at least: 5.7
 Tested up to: 5.7
 Requires PHP: 5.7
-Version: 2.1.0
+Version: 2.1.1
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase

quadrat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quadrat",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "",
   "main": "index.php",
   "dependencies": {},

quadrat/readme.txt

@@ -12,6 +12,10 @@ Quadrat is a simple, versatile WordPress theme, designed for blogs and podcasts.
 
 == Changelog ==
 
+= 1.1.2 =
+* Better comments styles
+* Bug fixes and Gutenberg + Blockbase compatibility improvements
+
 = 1.1.1 =
 * Replace images with locally bundled ones
 

quadrat/style.css

@@ -7,7 +7,7 @@ Description: Quadrat is a simple, versatile WordPress theme, designed for blogs
 Requires at least: 5.7
 Tested up to: 5.7
 Requires PHP: 5.7
-Version: 1.1.1
+Version: 1.1.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

seedlet-blocks/assets/theme.css

@@ -328,11 +328,17 @@ is passed all of the block attributes on the block definition in the template. *
 }
 
 .footer-credit {
-	display: flex;
 	font-family: var(--wp--preset--font-family--headings);
 	white-space: pre-wrap;
 }
 
+.footer-credit[class*="wp-container-"] {
+	margin-left: auto !important;
+	margin-right: auto !important;
+	padding: 0;
+	column-gap: 0;
+}
+
 .footer-credit > * {
 	align-self: center;
 	font-size: var(--wp--preset--font-size--small);

seedlet-blocks/block-template-parts/footer.html

@@ -2,22 +2,18 @@
 <div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:group {"className":"footer-credit","layout":{"inherit":false}} -->
+<!-- wp:group {"className":"footer-credit","layout":{"type":"flex"}} -->
 <div class="wp-block-group footer-credit"><!-- wp:site-title {"level":0} /-->
 
-<!-- wp:paragraph -->
-<p>, </p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph {"align":"left","fontSize":"small"} -->
-<p class="has-text-align-left has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
+	<!-- wp:paragraph -->
+	<p>, </p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:paragraph {"align":"left","fontSize":"small"} -->
+	<p class="has-text-align-left has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:group -->
 
 <!-- wp:spacer {"height":30} -->
 <div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
-
-<!-- wp:paragraph -->
-<p></p>
-<!-- /wp:paragraph -->

seedlet-blocks/block-templates/index.html

@@ -18,4 +18,4 @@
 </div>
 <!-- /wp:query -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container","align":"full"} /-->

seedlet-blocks/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "seedlet-blocks",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

seedlet-blocks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seedlet-blocks",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "",
   "main": "index.js",
   "dependencies": {},

seedlet-blocks/readme.txt

@@ -12,6 +12,10 @@ A block theme based on the Seedlet theme.
 
 == Changelog ==
 
+= 2.1.1 =
+* Better comments styles
+* Bug fixes and Gutenberg + Blockbase compatibility improvements
+
 = 2.1.0 =
 * Added color customization from the customizer
 

seedlet-blocks/sass/theme.scss

@@ -31,9 +31,14 @@
 }
 
 .footer-credit {
-	display: flex;
 	font-family: var(--wp--preset--font-family--headings);
 	white-space: pre-wrap;
+	&[class*="wp-container-"] {
+		margin-left: auto !important;
+		margin-right: auto !important;
+		padding: 0;
+		column-gap: 0;
+	}
 }
 
 .footer-credit > * {

seedlet-blocks/style.css

@@ -7,7 +7,7 @@ Description: A simple, text-driven, single-column block-based theme.
 Requires at least: 5.7
 Tested up to: 5.7
 Requires PHP: 5.7
-Version: 2.1.0
+Version: 2.1.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Template: blockbase

skatepark/404.php

@@ -8,7 +8,7 @@
 get_header();
 ?>
 	<main class="container-404">
-		<h2 class="wp-block-post-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'skatepark' ); ?></h1>
+		<h2 class="wp-block-post-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'skatepark' ); ?></h2>
 
 		<p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'skatepark' ); ?></p>
 

skatepark/assets/theme.css

@@ -318,6 +318,26 @@
 	text-indent: 5em;
 }
 
+.wp-block-quote.is-style-side-quote {
+	/* Needs .wp-block-quote class to override editor styles */
+	border: 0;
+	box-shadow: inset 0px 3px 0px 0px var(--wp--custom--color--primary);
+	margin: calc( var(--wp--custom--margin--vertical) * 1.5) 0;
+	padding: calc( var(--wp--custom--margin--baseline) * 1.35) 0 0 0;
+}
+
+.wp-block-quote.is-style-side-quote cite {
+	font-size: var(--wp--preset--font-size--normal);
+	font-style: normal;
+	font-weight: 600;
+}
+
+.wp-block-quote.is-style-side-quote p, .wp-block-quote.is-style-side-quote div.block-editor-rich-text__editable {
+	font-size: var(--wp--preset--font-size--medium);
+	line-height: 1.4em;
+	margin-bottom: calc( var(--wp--custom--margin--baseline) * 0.68);
+}
+
 .wp-block-quote.is-style-testimonial-quote {
 	/* Needs .wp-block-quote class to override editor styles */
 	border: 0;
@@ -374,6 +394,14 @@
 	--wp--custom--button--spacing--padding--bottom: 0.5em;
 }
 
+.paragraph-with-quote h4 {
+	margin: 0 0 calc( var(--wp--custom--margin--vertical) * 0.89) 0;
+}
+
+.paragraph-with-quote div:nth-child(2) p {
+	margin: calc( var(--wp--custom--margin--baseline) * 1.55) 0 0 0;
+}
+
 h1.is-style-skatepark-heading-border, h2.is-style-skatepark-heading-border, h3.is-style-skatepark-heading-border, h4.is-style-skatepark-heading-border, h5.is-style-skatepark-heading-border, h6.is-style-skatepark-heading-border {
 	display: inline-block;
 	border-top: 2px solid var(--wp--custom--color--primary);

skatepark/block-templates/index.html

@@ -10,7 +10,7 @@
 	<hr class="wp-block-separator is-style-wide"/>
 	<!-- /wp:separator -->
 	
-	<!-- wp:post-featured-image /-->
+	<!-- wp:post-featured-image {"style":{"color":{"duotone":["#000","#B9FB9C"]}}} /-->
 	
 	<!-- wp:post-title {"isLink":true,"fontSize":"normal"} /-->
 	

skatepark/block-templates/search.html

@@ -0,0 +1,27 @@
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"layout":{"inherit":true}, "tagName":"main"} -->
+<main class="wp-block-group">
+
+	<!-- wp:search {"label":""} /-->
+
+	<!-- wp:spacer {"height":45} -->
+		<div style="height:45px" aria-hidden="true" class="wp-block-spacer"></div>
+	<!-- /wp:spacer -->
+
+	<!-- wp:query {"queryId":1,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+	<!-- wp:post-template -->
+
+		<!-- wp:post-title {"level":3,"isLink":true} /-->
+		<!-- wp:post-excerpt /-->
+		<!-- wp:separator {"className":"is-style-wide"} -->
+			<hr class="wp-block-separator is-style-wide"/>
+		<!-- /wp:separator -->
+
+	<!-- /wp:post-template -->
+	<!-- /wp:query -->
+
+</main>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->

skatepark/child-theme.json

@@ -4,7 +4,7 @@
 			"gradients": [],
 			"duotone": [
                 {
-                    "colors": [ "#000", "#BFF5A5" ],
+                    "colors": [ "#000", "#B9FB9C" ],
                     "slug": "default-filter",
                     "name": "Default filter"
                 },
@@ -42,7 +42,7 @@
 				},
 				{
 					"slug": "background",
-					"color": "#BFF5A5",
+					"color": "#B9FB9C",
 					"name": "Background"
 				}
 			]

skatepark/inc/block-patterns.php

@@ -23,6 +23,7 @@ if ( ! function_exists( 'skatepark_register_block_patterns' ) ) :
 				'full-width-image-with-aside-caption',
 				'testimonial',
 				'two-columns-of-text',
+				'paragraph-with-quote',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {

skatepark/inc/block-styles.php

@@ -51,6 +51,15 @@ if ( ! function_exists( 'skatepark_register_block_styles' ) ) :
 				)
 			);
 
+			register_block_style(
+				'core/quote',
+				array(
+					'name'         => 'side-quote',
+					'label'        => __( 'Side quote', 'skatepark' ),
+					'style_handle' => 'side-quote',
+				)
+			);
+
 			register_block_style(
 				'core/quote',
 				array(

skatepark/inc/patterns/paragraph-with-quote.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Paragraph with quote.
+ *
+ * @package Skatepark
+ */
+
+return array(
+	'title'      => __( 'Paragraph with quote', 'skatepark' ),
+	'categories' => array( 'skatepark' ),
+	'content'    => '<!-- wp:columns {"align":"wide","className":"paragraph-with-quote"} -->
+	<div class="wp-block-columns alignwide paragraph-with-quote"><!-- wp:column {"width":"25%"} -->
+	<div class="wp-block-column" style="flex-basis:25%"></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"50%"} -->
+	<div class="wp-block-column" style="flex-basis:50%"><!-- wp:heading {"level":4} -->
+	<h4>' . esc_html__( 'Why come to Skatepark?', 'skatepark' ) . '</h4>
+	<!-- /wp:heading -->
+	
+	<!-- wp:paragraph {"className":"is-style-indented-paragraph"} -->
+	<p class="is-style-indented-paragraph">' . esc_html__( 'Skateboarding can teach people discipline, patience, and resiliency. It’s a great sport for kids with a lot of energy! We’ll help build up some structure and support in your life, all while you meet new people and have a ton of fun learning how to skateboard.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:paragraph -->
+	<p>' . esc_html__( 'Skateboarding is a social sport! Come hang out and meet some new friends to cheer you on while you skate. We have a strict no-bullying policy and maintain a supportive environment for all camp attendees. Plus, you’ll work 1:1 with our team of coaches to learn how to skate.', 'skatepark' ) . '</p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:column -->
+	
+	<!-- wp:column {"width":"25%"} -->
+	<div class="wp-block-column" style="flex-basis:25%"><!-- wp:quote {"className":"is-style-side-quote"} -->
+	<blockquote class="wp-block-quote is-style-side-quote"><p>' . esc_html__( 'I learned how to do a kick flip and made a bunch of new friends. Can’t wait to go back!', 'skatepark' ) . '</p><cite>' . esc_html__( '– Jane Doe, 11', 'skatepark' ) . '</cite></blockquote>
+	<!-- /wp:quote --></div>
+	<!-- /wp:column --></div>
+	<!-- /wp:columns -->',
+);

skatepark/inc/patterns/text-list-with-button.php

@@ -15,7 +15,7 @@ return array(
 		<div class="wp-block-column" style="flex-basis:75%"><!-- wp:heading {"level":4,"className":"is-style-skatepark-heading-border"} -->
 		<h4 class="is-style-skatepark-heading-border">' . esc_html__( 'Visiting Coaches', 'skatepark' ) . '</h4>
 		<!-- /wp:heading -->
-		<!-- wp:heading --><h2>' . esc_html__( 'Rodney Mullen. Paul Rodriguez. Bucky Lasek. Bob Burnquist. Tony Hawk. Ryan Sheckler. Eric Koston. Bam Margera. Chris Cole. Andrew Reynolds.', 'skatepark' ) . '</h2>
+		<!-- wp:heading --><h2>' . esc_html__( 'Steph Harper. Buddy Sellers. Mehmet Farrow. Bob Lopez. Tammy Habich. Tye Barclay. Kaden Price. Lily Rivera. Chris Wright. Sammy Sanchez.', 'skatepark' ) . '</h2>
 		<!-- /wp:heading -->
 		<!-- wp:buttons -->
 		<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline"} -->

skatepark/inc/patterns/two-columns-of-text.php

@@ -11,7 +11,7 @@ return array(
 	'content'    => '<!-- wp:columns {"align":"wide"} -->
 	<div class="wp-block-columns alignwide"><!-- wp:column {"width":"","style":{"spacing":{"padding":{"right":"5em"}}}} -->
 	<div class="wp-block-column" style="padding-right:5em"><!-- wp:paragraph {"fontSize":"medium"} -->
-	<p class="has-medium-font-size">' . esc_html__( 'Rodney Mullen. Paul Rodriguez. Bucky Lasek. Bob Burnquist. Tony Hawk. Ryan Sheckler. Eric Koston. Bam Margera. Chris Cole. Andrew Reynolds. The are all skateboarding icons. Some of them even have video games you may have played.', 'skatepark' ) . '</p>
+	<p class="has-medium-font-size">' . esc_html__( 'Steph Harper. Buddy Sellers. Mehmet Farrow. Bob Lopez. Tammy Habich. Tye Barclay. Kaden Price. Lily Rivera. Chris Wright. Sammy Sanchez. They are all skateboarding icons. Some of them even have video games you may have played.', 'skatepark' ) . '</p>
 	<!-- /wp:paragraph --></div>
 	<!-- /wp:column -->
 	

skatepark/sass/block-patterns/_paragraph-with-quote.scss

@@ -0,0 +1,11 @@
+.paragraph-with-quote {
+    h4 {
+        margin: 0 0 calc( var(--wp--custom--margin--vertical) * 0.89 ) 0;
+    }
+
+    div:nth-child(2) {    
+        p {
+            margin: calc( var(--wp--custom--margin--baseline) * 1.55 ) 0 0 0;
+        }
+    }
+}

skatepark/sass/block-styles/_side-quote.scss

@@ -0,0 +1,18 @@
+.wp-block-quote.is-style-side-quote { /* Needs .wp-block-quote class to override editor styles */
+	border: 0;
+	box-shadow: inset 0px 3px 0px 0px var(--wp--custom--color--primary);
+	margin: calc( var(--wp--custom--margin--vertical) * 1.5) 0;
+	padding: calc( var(--wp--custom--margin--baseline) * 1.35) 0 0 0;
+
+	cite {
+		font-size: var(--wp--preset--font-size--normal);
+		font-style: normal;
+		font-weight: 600;
+	}
+
+	p, div.block-editor-rich-text__editable {
+		font-size: var(--wp--preset--font-size--medium);
+		line-height: 1.4em;
+		margin-bottom: calc( var(--wp--custom--margin--baseline) * 0.68);
+	}
+}

skatepark/sass/blocks/_query.scss

@@ -7,4 +7,4 @@
 			padding: 10px;
 		}
 	}
-}
+}

skatepark/sass/theme.scss

@@ -10,8 +10,10 @@
 @import "block-patterns/pre-footer";
 @import "block-styles/image-caption";
 @import "block-styles/indented-paragraph";
+@import "block-styles/side-quote";
 @import "block-styles/testimonial-quote";
 @import "block-patterns/pre-footer";
+@import "block-patterns/paragraph-with-quote";
 @import "elements/headings";
 @import "elements/links";
 @import "templates/header";

skatepark/theme.json

@@ -45,7 +45,7 @@
 				},
 				{
 					"slug": "background",
-					"color": "#BFF5A5",
+					"color": "#B9FB9C",
 					"name": "Background"
 				}
 			],
@@ -53,7 +53,7 @@
 				{
 					"colors": [
 						"#000",
-						"#BFF5A5"
+						"#B9FB9C"
 					],
 					"slug": "default-filter",
 					"name": "Default filter"