From e1e35830d30e9498439331a1bfc4d695361b14f6 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 12 Apr 2021 12:51:35 -0400
Subject: [PATCH 1/7] Try more opinionated query block patterns

---
 lib/block-patterns.php | 84 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index da42a0b25f8aec..6202ae16b8a70b 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -70,3 +70,87 @@
 						<!-- /wp:query -->',
 	)
 );
+
+register_block_pattern(
+	'query/large-title-and-date',
+	array(
+		'title'      => __( 'Large Title and Date', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:group {"align":"full","backgroundColor":"black","textColor":"white","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}}}} -->
+						<div class="wp-block-group alignfull has-white-color has-black-background-color has-text-color has-background" style="padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px">
+						<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:separator {"color":"white","align":"wide","className":"is-style-wide"} -->
+						<hr class="wp-block-separator alignwide has-text-color has-background has-white-background-color has-white-color is-style-wide"/>
+						<!-- /wp:separator -->
+						<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
+						<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
+						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"textColor":"white","fontSize":"extra-small"} /--></div>
+						<!-- /wp:column -->
+						<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->
+						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"}},"textColor":"white"} /--></div>
+						<!-- /wp:column --></div>
+						<!-- /wp:columns -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query --></div>
+						<!-- /wp:group -->',
+	)
+);
+
+register_block_pattern(
+	'query/posts-grid',
+	array(
+		'title'      => __( 'Post Grid', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:query {"queryId":11,"query":{"perPage":12,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:cover {"customOverlayColor":"#efefef","minHeight":500,"minHeightUnit":"px","contentPosition":"top left","style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}}} -->
+						<div class="wp-block-cover has-background-dim has-custom-content-position is-position-top-left" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px;background-color:#efefef;min-height:500px"><div class="wp-block-cover__inner-container"><!-- wp:post-title {"isLink":true,"style":{"color":{"text":"#000000"}}} /-->
+
+						<!-- wp:post-excerpt {"style":{"color":{"text":"#000000"}}} /-->
+
+						<!-- wp:post-date {"style":{"color":{"text":"#000000"}}} /--></div></div>
+						<!-- /wp:cover -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query -->',
+	)
+);
+
+register_block_pattern(
+	'query/offset-posts',
+	array(
+		'title'      => __( 'Offset Posts', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:group {"tagName":"main","layout":{"inherit":false}} -->
+						<main class="wp-block-group"><!-- wp:columns -->
+						<div class="wp-block-columns"><!-- wp:column {"width":50} -->
+						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:post-featured-image /-->
+						<!-- wp:post-title /-->
+						<!-- wp:post-date /-->
+						<!-- wp:spacer {"height":200} -->
+						<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
+						<!-- /wp:spacer -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query --></div>
+						<!-- /wp:column -->
+						<!-- wp:column {"width":50} -->
+						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":5,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:spacer {"height":200} -->
+						<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>
+						<!-- /wp:spacer -->
+						<!-- wp:post-featured-image /-->
+						<!-- wp:post-title /-->
+						<!-- wp:post-date /-->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query --></div>
+						<!-- /wp:column --></div>
+						<!-- /wp:columns --></main>
+						<!-- /wp:group -->',
+	)
+);

From 5759b5c3bcb906fe27c2ddfcc3dee98401d2ff41 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 12 Apr 2021 13:19:17 -0400
Subject: [PATCH 2/7] Simplify posts grid.

---
 lib/block-patterns.php | 46 ++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 6202ae16b8a70b..ee695546b1b2f2 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -71,6 +71,24 @@
 	)
 );
 
+register_block_pattern(
+	'query/posts-grid',
+	array(
+		'title'      => __( 'Post Grid', 'gutenberg' ),
+		'blockTypes' => array( 'core/query' ),
+		'categories' => array( 'Query' ),
+		'content'    => '<!-- wp:query {"queryId":11,"query":{"perPage":12,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
+						<!-- wp:query-loop -->
+						<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
+						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->
+						<!-- wp:post-excerpt /-->
+						<!-- wp:post-date /--></div>
+						<!-- /wp:group -->
+						<!-- /wp:query-loop -->
+						<!-- /wp:query -->',
+	)
+);
+
 register_block_pattern(
 	'query/large-title-and-date',
 	array(
@@ -98,35 +116,15 @@
 	)
 );
 
-register_block_pattern(
-	'query/posts-grid',
-	array(
-		'title'      => __( 'Post Grid', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'Query' ),
-		'content'    => '<!-- wp:query {"queryId":11,"query":{"perPage":12,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
-						<!-- wp:query-loop -->
-						<!-- wp:cover {"customOverlayColor":"#efefef","minHeight":500,"minHeightUnit":"px","contentPosition":"top left","style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}}} -->
-						<div class="wp-block-cover has-background-dim has-custom-content-position is-position-top-left" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px;background-color:#efefef;min-height:500px"><div class="wp-block-cover__inner-container"><!-- wp:post-title {"isLink":true,"style":{"color":{"text":"#000000"}}} /-->
-
-						<!-- wp:post-excerpt {"style":{"color":{"text":"#000000"}}} /-->
-
-						<!-- wp:post-date {"style":{"color":{"text":"#000000"}}} /--></div></div>
-						<!-- /wp:cover -->
-						<!-- /wp:query-loop -->
-						<!-- /wp:query -->',
-	)
-);
-
 register_block_pattern(
 	'query/offset-posts',
 	array(
 		'title'      => __( 'Offset Posts', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
-		'content'    => '<!-- wp:group {"tagName":"main","layout":{"inherit":false}} -->
-						<main class="wp-block-group"><!-- wp:columns -->
-						<div class="wp-block-columns"><!-- wp:column {"width":50} -->
+		'content'    => '<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
+						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
+						<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->
 						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:post-featured-image /-->
@@ -138,7 +136,7 @@
 						<!-- /wp:query-loop -->
 						<!-- /wp:query --></div>
 						<!-- /wp:column -->
-						<!-- wp:column {"width":50} -->
+						<!-- wp:column {"width":"50%"} -->
 						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":5,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:spacer {"height":200} -->

From 509ba46dc116500f20f7dd714b39980170986544 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Mon, 12 Apr 2021 14:00:00 -0400
Subject: [PATCH 3/7] Remove query IDs, adjust perPage values.

---
 lib/block-patterns.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index ee695546b1b2f2..6846a8d2f362d3 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -77,7 +77,7 @@
 		'title'      => __( 'Post Grid', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
-		'content'    => '<!-- wp:query {"queryId":11,"query":{"perPage":12,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
+		'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
 						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->
@@ -97,7 +97,7 @@
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:group {"align":"full","backgroundColor":"black","textColor":"white","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}}}} -->
 						<div class="wp-block-group alignfull has-white-color has-black-background-color has-text-color has-background" style="padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px">
-						<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:separator {"color":"white","align":"wide","className":"is-style-wide"} -->
 						<hr class="wp-block-separator alignwide has-text-color has-background has-white-background-color has-white-color is-style-wide"/>
@@ -125,7 +125,7 @@
 		'content'    => '<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->
 						<main class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->
 						<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->
-						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:post-featured-image /-->
 						<!-- wp:post-title /-->
@@ -137,7 +137,7 @@
 						<!-- /wp:query --></div>
 						<!-- /wp:column -->
 						<!-- wp:column {"width":"50%"} -->
-						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"queryId":11,"query":{"perPage":5,"pages":0,"offset":5,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
+						<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"layout":{"type":"list"}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:spacer {"height":200} -->
 						<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>

From 24cec1cd4356daf31a7351dcdc3097817ad95cfd Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 08:30:59 -0400
Subject: [PATCH 4/7] Use hex values for colors, make titles clickable in the
 Large Title and Date pattern.

---
 lib/block-patterns.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 6846a8d2f362d3..83ac3e4d54a96a 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -95,19 +95,20 @@
 		'title'      => __( 'Large Title and Date', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
-		'content'    => '<!-- wp:group {"align":"full","backgroundColor":"black","textColor":"white","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}}}} -->
-						<div class="wp-block-group alignfull has-white-color has-black-background-color has-text-color has-background" style="padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px">
-						<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+		'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->
+						<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"queryId":3,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
-						<!-- wp:separator {"color":"white","align":"wide","className":"is-style-wide"} -->
-						<hr class="wp-block-separator alignwide has-text-color has-background has-white-background-color has-white-color is-style-wide"/>
+						<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->
+						<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>
 						<!-- /wp:separator -->
+
 						<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
 						<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"textColor":"white","fontSize":"extra-small"} /--></div>
+						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>
 						<!-- /wp:column -->
+
 						<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"}},"textColor":"white"} /--></div>
+						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>
 						<!-- /wp:column --></div>
 						<!-- /wp:columns -->
 						<!-- /wp:query-loop -->

From 34a9161d432fc8afd089b1f3b8bf7199ebd2aa29 Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 08:32:30 -0400
Subject: [PATCH 5/7] Simplify pattern names.

---
 lib/block-patterns.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 83ac3e4d54a96a..14504d35479e9f 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -72,9 +72,9 @@
 );
 
 register_block_pattern(
-	'query/posts-grid',
+	'query/grid-posts',
 	array(
-		'title'      => __( 'Post Grid', 'gutenberg' ),
+		'title'      => __( 'Grid', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"layout":{"type":"flex","columns":3}} -->
@@ -90,9 +90,9 @@
 );
 
 register_block_pattern(
-	'query/large-title-and-date',
+	'query/large-title-posts',
 	array(
-		'title'      => __( 'Large Title and Date', 'gutenberg' ),
+		'title'      => __( 'Large Title', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->
@@ -120,7 +120,7 @@
 register_block_pattern(
 	'query/offset-posts',
 	array(
-		'title'      => __( 'Offset Posts', 'gutenberg' ),
+		'title'      => __( 'Offset', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->

From 37564abeb9ba09cec55f7c93ace26a750e52c89f Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 09:24:13 -0400
Subject: [PATCH 6/7] Remove Small pattern, rename Large and Medium patterns.

---
 lib/block-patterns.php | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 14504d35479e9f..9dc7122991850e 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -9,9 +9,9 @@
 
 // Initial Query block patterns.
 register_block_pattern(
-	'query/large-posts',
+	'query/standard-posts',
 	array(
-		'title'      => __( 'Large', 'gutenberg' ),
+		'title'      => __( 'Standard', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
@@ -31,7 +31,7 @@
 register_block_pattern(
 	'query/medium-posts',
 	array(
-		'title'      => __( 'Medium', 'gutenberg' ),
+		'title'      => __( 'Image at Left', 'gutenberg' ),
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
@@ -50,27 +50,6 @@
 	)
 );
 
-register_block_pattern(
-	'query/small-posts',
-	array(
-		'title'      => __( 'Small', 'gutenberg' ),
-		'blockTypes' => array( 'core/query' ),
-		'categories' => array( 'Query' ),
-		'content'    => '<!-- wp:query {"query":{"perPage":1,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
-						<!-- wp:query-loop -->
-						<!-- wp:columns {"verticalAlignment":"center"} -->
-						<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>
-						<!-- /wp:column -->
-						<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->
-						<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>
-						<!-- /wp:column --></div>
-						<!-- /wp:columns -->
-						<!-- /wp:query-loop -->
-						<!-- /wp:query -->',
-	)
-);
-
 register_block_pattern(
 	'query/grid-posts',
 	array(

From 97ff5e9d716a60d25b8a71de8e6dec4100d904cd Mon Sep 17 00:00:00 2001
From: Kjell Reigstad <kjell@kjellr.com>
Date: Tue, 13 Apr 2021 09:25:56 -0400
Subject: [PATCH 7/7] Remove queryId.

---
 lib/block-patterns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/block-patterns.php b/lib/block-patterns.php
index 9dc7122991850e..b35f07a955ed3c 100644
--- a/lib/block-patterns.php
+++ b/lib/block-patterns.php
@@ -75,7 +75,7 @@
 		'blockTypes' => array( 'core/query' ),
 		'categories' => array( 'Query' ),
 		'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->
-						<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"queryId":3,"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
+						<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","categoryIds":[],"tagIds":[],"order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true}} -->
 						<!-- wp:query-loop -->
 						<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->
 						<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>