From 9e3f0706a1af363f53749ea68c6e0ef77fbc4c96 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 11:37:10 +0100
Subject: [PATCH 01/12] refactor blockbase and skatepark's footers into
 patterns

---
 blockbase/block-template-parts/footer.html | 12 +----
 blockbase/inc/block-patterns.php           |  2 +
 blockbase/inc/patterns/footer-columns.php  | 59 ++++++++++++++++++++++
 blockbase/inc/patterns/footer-simple.php   | 23 +++++++++
 skatepark/block-template-parts/footer.html | 16 +-----
 5 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 blockbase/inc/patterns/footer-columns.php
 create mode 100644 blockbase/inc/patterns/footer-simple.php

diff --git a/blockbase/block-template-parts/footer.html b/blockbase/block-template-parts/footer.html
index 39c6cf2247..d9c01bb4e6 100644
--- a/blockbase/block-template-parts/footer.html
+++ b/blockbase/block-template-parts/footer.html
@@ -1,11 +1 @@
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-	<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","right":"0px","bottom":"30px","left":"0px"}}}} -->
-	<div class="wp-block-group" style="padding-top:80px;padding-right:0px;padding-bottom:30px;padding-left:0px">
-		<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
-		<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny);">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-		<!-- /wp:paragraph -->
-	</div>
-	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 177f585d13..0e5775b785 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -18,6 +18,8 @@ function blockbase_register_block_patterns() {
 		if ( function_exists( 'register_block_pattern' ) ) {
 			$block_patterns = array(
 				'404',
+				'footer-simple',
+				'footer-columns',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/blockbase/inc/patterns/footer-columns.php b/blockbase/inc/patterns/footer-columns.php
new file mode 100644
index 0000000000..b86199425a
--- /dev/null
+++ b/blockbase/inc/patterns/footer-columns.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Footer with 3 columns
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Footer with 3 columns', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
+	<div class="wp-block-group">
+		
+		<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"60px","bottom":"60px"}}},"className":"pre-footer"} -->
+		<div class="wp-block-group alignwide pre-footer" style="padding-top:60px;padding-bottom:60px"><!-- wp:columns -->
+		<div class="wp-block-columns"><!-- wp:column -->
+		<div class="wp-block-column"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"large"} /-->
+
+		<!-- wp:paragraph {"fontSize":"small"} -->
+		<p class="has-small-font-size">' . esc_html__( "Skatepark's coaches will work with you to develop and improve your skating abilities.", 'blockbase' ) . '</p>
+		<!-- /wp:paragraph -->
+
+		<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--foreground)","className":"is-style-logos-only"} -->
+		<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"http://twitter.com","service":"twitter"} /-->
+
+		<!-- wp:social-link {"url":"http://facebook.com","service":"facebook"} /-->
+
+		<!-- wp:social-link {"url":"http://instagram.com","service":"instagram"} /--></ul>
+		<!-- /wp:social-links --></div>
+		<!-- /wp:column -->
+
+		<!-- wp:column -->
+		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
+		<h3 style="font-size:14px;"><strong>' . esc_html__( 'More info', 'blockbase' ) . '</strong></h3>
+		<!-- /wp:heading -->
+
+		<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /--></div>
+		<!-- /wp:column -->
+
+		<!-- wp:column -->
+		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
+		<h3 style="font-size:14px"><strong>' . esc_html__( 'Search', 'blockbase' ) . '</strong></h3><!-- /wp:heading --><!-- wp:search {"label":"' . esc_html__( 'Search', 'blockbase' ) . '","showLabel":false,"buttonText":"' . esc_html__( 'Search', 'blockbase' ) . '","buttonPosition":"button-inside"} /--></div>
+		<!-- /wp:column --></div>
+		<!-- /wp:columns --></div>
+		<!-- /wp:group -->
+	
+		<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"bottom":"30px"}}}} -->
+		<div class="wp-block-group site-footer" style="padding-bottom: 30px">
+	
+		<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
+		<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny)">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+		<!-- /wp:paragraph -->
+	
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->',
+);
diff --git a/blockbase/inc/patterns/footer-simple.php b/blockbase/inc/patterns/footer-simple.php
new file mode 100644
index 0000000000..44dfa75ecd
--- /dev/null
+++ b/blockbase/inc/patterns/footer-simple.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Simple footer
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Simple footer', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
+	<div class="wp-block-group">
+		<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","right":"0px","bottom":"30px","left":"0px"}}}} -->
+		<div class="wp-block-group" style="padding-top:80px;padding-right:0px;padding-bottom:30px;padding-left:0px">
+			<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
+			<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny);">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+			<!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->',
+);
diff --git a/skatepark/block-template-parts/footer.html b/skatepark/block-template-parts/footer.html
index 9747177d2e..0430c5ef4a 100644
--- a/skatepark/block-template-parts/footer.html
+++ b/skatepark/block-template-parts/footer.html
@@ -1,15 +1 @@
-<!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group">
-    <!-- wp:pattern {"slug":"skatepark/pre-footer"} /-->
-
-    <!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"bottom":"30px"}}}} -->
-    <div class="wp-block-group site-footer" style="padding-bottom: 30px">
-
-    <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
-    <p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny)">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-    <!-- /wp:paragraph -->
-
-    </div>
-    <!-- /wp:group -->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:pattern {"slug":"blockbase/footer-columns"} /-->
\ No newline at end of file

From d025f9bac98f148e6ffddb18076775e95bc738c7 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 11:51:01 +0100
Subject: [PATCH 02/12] refactored videomaker's footer to a pattern

---
 blockbase/inc/block-patterns.php              |  1 +
 .../inc/patterns/footer-vertical-menu.php     | 32 +++++++++++++++++++
 .../block-template-parts/footer.html          | 20 +-----------
 videomaker/block-template-parts/footer.html   | 20 +-----------
 4 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 blockbase/inc/patterns/footer-vertical-menu.php

diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 0e5775b785..85dc97e78c 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -20,6 +20,7 @@ function blockbase_register_block_patterns() {
 				'404',
 				'footer-simple',
 				'footer-columns',
+				'footer-vertical-menu',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/blockbase/inc/patterns/footer-vertical-menu.php b/blockbase/inc/patterns/footer-vertical-menu.php
new file mode 100644
index 0000000000..adb6329d50
--- /dev/null
+++ b/blockbase/inc/patterns/footer-vertical-menu.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Footer with a vertical menu
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Footer with a vertical menu', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"layout":{"inherit":"true"}} -->
+	<div class="wp-block-group">
+		<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"var(--wp--custom--gap--horizontal"}}}} -->
+		<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: var(--wp--custom--gap--horizontal);">	<!-- wp:group -->
+			<div class="wp-block-group">
+				<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
+			</div>
+			<!-- /wp:group -->
+			<!-- wp:group {"className":"footer-credit"} -->
+			<div class="wp-block-group footer-credit">
+				<!-- wp:paragraph {"fontSize":"small"} -->
+				<p class="has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+				<!-- /wp:paragraph -->
+			</div>
+			<!-- /wp:group -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->
+	',
+);
diff --git a/videomaker-white/block-template-parts/footer.html b/videomaker-white/block-template-parts/footer.html
index 3aec6144a7..a70d82dc89 100644
--- a/videomaker-white/block-template-parts/footer.html
+++ b/videomaker-white/block-template-parts/footer.html
@@ -1,19 +1 @@
-<!-- wp:group {"layout":{"inherit":"true"}} -->
-<div class="wp-block-group">
-	<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"var(--wp--custom--gap--horizontal"}}}} -->
-	<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: var(--wp--custom--gap--horizontal);">	<!-- wp:group -->
-		<div class="wp-block-group">
-			<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:group {"className":"footer-credit"} -->
-		<div class="wp-block-group footer-credit">
-			<!-- wp:paragraph {"fontSize":"small"} -->
-			<p class="has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-			<!-- /wp:paragraph -->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
+<!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file
diff --git a/videomaker/block-template-parts/footer.html b/videomaker/block-template-parts/footer.html
index 3aec6144a7..a70d82dc89 100644
--- a/videomaker/block-template-parts/footer.html
+++ b/videomaker/block-template-parts/footer.html
@@ -1,19 +1 @@
-<!-- wp:group {"layout":{"inherit":"true"}} -->
-<div class="wp-block-group">
-	<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"var(--wp--custom--gap--horizontal"}}}} -->
-	<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: var(--wp--custom--gap--horizontal);">	<!-- wp:group -->
-		<div class="wp-block-group">
-			<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
-		</div>
-		<!-- /wp:group -->
-		<!-- wp:group {"className":"footer-credit"} -->
-		<div class="wp-block-group footer-credit">
-			<!-- wp:paragraph {"fontSize":"small"} -->
-			<p class="has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-			<!-- /wp:paragraph -->
-		</div>
-		<!-- /wp:group -->
-	</div>
-	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
+<!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file

From 780371b0d5ac2fe8652c613b9af78581d3a529a9 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 11:58:34 +0100
Subject: [PATCH 03/12] removed skatepark's pattern

---
 skatepark/inc/block-patterns.php      |  3 +-
 skatepark/inc/patterns/pre-footer.php | 43 ---------------------------
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 skatepark/inc/patterns/pre-footer.php

diff --git a/skatepark/inc/block-patterns.php b/skatepark/inc/block-patterns.php
index e872fa93bb..6734b2a3e7 100644
--- a/skatepark/inc/block-patterns.php
+++ b/skatepark/inc/block-patterns.php
@@ -20,14 +20,13 @@ function skatepark_register_block_patterns() {
 			$block_patterns = array(
 				'blog-posts',
 				'mixed-media-in-container',
-				'pre-footer',
 				'text-list-with-button',
 				'full-width-image-with-aside-caption',
 				'testimonial',
 				'two-columns-of-text',
 				'paragraph-with-quote',
 				'columns-in-container',
-				'post-navigation-labeled'
+				'post-navigation-labeled',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/skatepark/inc/patterns/pre-footer.php b/skatepark/inc/patterns/pre-footer.php
deleted file mode 100644
index 83c39e7c29..0000000000
--- a/skatepark/inc/patterns/pre-footer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Pre Footer.
- *
- * @package Skatepark
- */
-
-return array(
-	'title'      => __( 'Footer', 'skatepark' ),
-	'categories' => array( 'skatepark' ),
-	'content'    => '<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"60px","bottom":"60px"}}},"className":"pre-footer"} -->
-	<div class="wp-block-group alignwide pre-footer" style="padding-top:60px;padding-bottom:60px"><!-- wp:columns -->
-		<div class="wp-block-columns"><!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"large"} /-->
-
-		<!-- wp:paragraph {"fontSize":"small"} -->
-		<p class="has-small-font-size">' . esc_html__( "Skatepark's coaches will work with you to develop and improve your skating abilities.", 'skatepark' ) . '</p>
-		<!-- /wp:paragraph -->
-
-		<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--foreground)","className":"is-style-logos-only"} -->
-		<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"http://twitter.com","service":"twitter"} /-->
-
-		<!-- wp:social-link {"url":"http://facebook.com","service":"facebook"} /-->
-
-		<!-- wp:social-link {"url":"http://instagram.com","service":"instagram"} /--></ul>
-		<!-- /wp:social-links --></div>
-		<!-- /wp:column -->
-
-		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
-		<h3 style="font-size:14px;"><strong>' . esc_html__( 'More info', 'skatepark' ) . '</strong></h3>
-		<!-- /wp:heading -->
-
-		<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /--></div>
-		<!-- /wp:column -->
-
-		<!-- wp:column -->
-		<div class="wp-block-column"><!-- wp:heading {"level":3,"style":{"typography":{"fontSize":"14px"}}} -->
-		<h3 style="font-size:14px"><strong>' . esc_html__( 'Search', 'skatepark' ) . '</strong></h3><!-- /wp:heading --><!-- wp:search {"label":"' . esc_html__( 'Search', 'skatepark' ) . '","showLabel":false,"buttonText":"' . esc_html__( 'Search', 'skatepark' ) . '","buttonPosition":"button-inside"} /--></div>
-		<!-- /wp:column --></div>
-		<!-- /wp:columns --></div>
-		<!-- /wp:group -->',
-);

From 177ab5bae9a9751b3cb9334355d0bfc0661c401e Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 12:07:01 +0100
Subject: [PATCH 04/12] refactored arbutus

---
 arbutus/block-template-parts/footer.html     | 14 +----------
 blockbase/inc/block-patterns.php             |  1 +
 blockbase/inc/patterns/footer-underlined.php | 25 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 blockbase/inc/patterns/footer-underlined.php

diff --git a/arbutus/block-template-parts/footer.html b/arbutus/block-template-parts/footer.html
index 85f33a971f..84a9b6fe65 100644
--- a/arbutus/block-template-parts/footer.html
+++ b/arbutus/block-template-parts/footer.html
@@ -1,13 +1 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"60px"}}},"layout":{"inherit":false}} -->
-<div class="wp-block-group" style="padding-top:60px"><!-- wp:separator {"color":"primary","className":"is-style-wide"} -->
-<hr class="wp-block-separator has-text-color has-background has-primary-background-color has-primary-color is-style-wide"/>
-<!-- /wp:separator -->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"20px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
-<div class="wp-block-group" style="padding-bottom:20px"><!-- wp:paragraph {"fontSize":"small"} -->
-<p class="has-small-font-size"><meta charset="utf-8"><strong>Proudly Powered by <a rel="nofollow" href="https://wordpress.org">WordPress</a></strong></p>
-<!-- /wp:paragraph -->
-
-<!-- wp:navigation {"itemsJustification":"center","overlayMenu":"never","__unstableSocialLinks":"social"} /--></div>
-<!-- /wp:group --></div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:pattern {"slug":"blockbase/footer-underlined"} /-->
\ No newline at end of file
diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 85dc97e78c..0d922bcac0 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -21,6 +21,7 @@ function blockbase_register_block_patterns() {
 				'footer-simple',
 				'footer-columns',
 				'footer-vertical-menu',
+				'footer-underlined',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/blockbase/inc/patterns/footer-underlined.php b/blockbase/inc/patterns/footer-underlined.php
new file mode 100644
index 0000000000..79150abb56
--- /dev/null
+++ b/blockbase/inc/patterns/footer-underlined.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Underlined footer
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Underlined footer', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"style":{"spacing":{"padding":{"top":"60px"}}},"layout":{"inherit":false}} -->
+	<div class="wp-block-group" style="padding-top:60px"><!-- wp:separator {"color":"primary","className":"is-style-wide"} -->
+	<hr class="wp-block-separator has-text-color has-background has-primary-background-color has-primary-color is-style-wide"/>
+	<!-- /wp:separator -->
+	
+	<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"20px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	<div class="wp-block-group" style="padding-bottom:20px"><!-- wp:paragraph {"fontSize":"small"} -->
+	<p class="has-small-font-size"><meta charset="utf-8"><strong>Proudly Powered by <a rel="nofollow" href="https://wordpress.org">WordPress</a></strong></p>
+	<!-- /wp:paragraph -->
+	
+	<!-- wp:navigation {"itemsJustification":"center","overlayMenu":"never","__unstableSocialLinks":"social"} /--></div>
+	<!-- /wp:group --></div>
+	<!-- /wp:group -->',
+);

From e39553b583ea2da489b18292c9538a4e4bd8ae9f Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 12:08:12 +0100
Subject: [PATCH 05/12] renamed arbutus footer

---
 arbutus/block-template-parts/footer.html                      | 2 +-
 blockbase/inc/block-patterns.php                              | 2 +-
 .../patterns/{footer-underlined.php => footer-separator.php}  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename blockbase/inc/patterns/{footer-underlined.php => footer-separator.php} (91%)

diff --git a/arbutus/block-template-parts/footer.html b/arbutus/block-template-parts/footer.html
index 84a9b6fe65..d36c3fa529 100644
--- a/arbutus/block-template-parts/footer.html
+++ b/arbutus/block-template-parts/footer.html
@@ -1 +1 @@
-<!-- wp:pattern {"slug":"blockbase/footer-underlined"} /-->
\ No newline at end of file
+<!-- wp:pattern {"slug":"blockbase/footer-separator"} /-->
\ No newline at end of file
diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 0d922bcac0..733a3af086 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -21,7 +21,7 @@ function blockbase_register_block_patterns() {
 				'footer-simple',
 				'footer-columns',
 				'footer-vertical-menu',
-				'footer-underlined',
+				'footer-separator',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/blockbase/inc/patterns/footer-underlined.php b/blockbase/inc/patterns/footer-separator.php
similarity index 91%
rename from blockbase/inc/patterns/footer-underlined.php
rename to blockbase/inc/patterns/footer-separator.php
index 79150abb56..6198a930ed 100644
--- a/blockbase/inc/patterns/footer-underlined.php
+++ b/blockbase/inc/patterns/footer-separator.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Underlined footer
+ * Footer with menu and separator
  *
  * @package Blockbase
  */
 
 return array(
-	'title'      => __( 'Underlined footer', 'blockbase' ),
+	'title'      => __( 'Footer with menu and separator', 'blockbase' ),
 	'categories' => array( 'blockbase' ),
 	'blockTypes' => array( 'core/template-part/footer' ),
 	'content'    => '<!-- wp:group {"style":{"spacing":{"padding":{"top":"60px"}}},"layout":{"inherit":false}} -->

From a656d7af353bf10692f760153a1e7004b49fb065 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 12:15:55 +0100
Subject: [PATCH 06/12] quadrat, zoologist, geologist + variations

---
 blockbase/inc/patterns/footer-simple.php          |  4 ++--
 geologist-blue/block-template-parts/footer.html   | 14 +++++++-------
 geologist-cream/block-template-parts/footer.html  | 14 +++++++-------
 geologist-slate/block-template-parts/footer.html  | 14 +++++++-------
 geologist-yellow/block-template-parts/footer.html | 14 +++++++-------
 geologist/block-template-parts/footer.html        | 14 +++++++-------
 quadrat-black/block-template-parts/footer.html    | 14 +++++++-------
 quadrat-green/block-template-parts/footer.html    | 14 +++++++-------
 quadrat-red/block-template-parts/footer.html      | 14 +++++++-------
 quadrat-white/block-template-parts/footer.html    | 14 +++++++-------
 quadrat-yellow/block-template-parts/footer.html   | 14 +++++++-------
 quadrat/block-template-parts/footer.html          | 14 +++++++-------
 zoologist/block-template-parts/footer.html        | 14 +++++++-------
 13 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/blockbase/inc/patterns/footer-simple.php b/blockbase/inc/patterns/footer-simple.php
index 44dfa75ecd..f7f7f0decc 100644
--- a/blockbase/inc/patterns/footer-simple.php
+++ b/blockbase/inc/patterns/footer-simple.php
@@ -13,8 +13,8 @@
 	<div class="wp-block-group">
 		<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","right":"0px","bottom":"30px","left":"0px"}}}} -->
 		<div class="wp-block-group" style="padding-top:80px;padding-right:0px;padding-bottom:30px;padding-left:0px">
-			<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"var(--wp--custom--font-sizes--tiny)"}}} -->
-			<p class="has-text-align-center" style="font-size:var(--wp--custom--font-sizes--tiny);">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+			<!-- wp:paragraph {"align":"center"} -->
+			<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
 			<!-- /wp:paragraph -->
 		</div>
 		<!-- /wp:group -->
diff --git a/geologist-blue/block-template-parts/footer.html b/geologist-blue/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/geologist-blue/block-template-parts/footer.html
+++ b/geologist-blue/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-cream/block-template-parts/footer.html b/geologist-cream/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/geologist-cream/block-template-parts/footer.html
+++ b/geologist-cream/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-slate/block-template-parts/footer.html b/geologist-slate/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/geologist-slate/block-template-parts/footer.html
+++ b/geologist-slate/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist-yellow/block-template-parts/footer.html b/geologist-yellow/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/geologist-yellow/block-template-parts/footer.html
+++ b/geologist-yellow/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/geologist/block-template-parts/footer.html b/geologist/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/geologist/block-template-parts/footer.html
+++ b/geologist/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-black/block-template-parts/footer.html b/quadrat-black/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat-black/block-template-parts/footer.html
+++ b/quadrat-black/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-green/block-template-parts/footer.html b/quadrat-green/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat-green/block-template-parts/footer.html
+++ b/quadrat-green/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-red/block-template-parts/footer.html b/quadrat-red/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat-red/block-template-parts/footer.html
+++ b/quadrat-red/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-white/block-template-parts/footer.html b/quadrat-white/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat-white/block-template-parts/footer.html
+++ b/quadrat-white/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat-yellow/block-template-parts/footer.html b/quadrat-yellow/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat-yellow/block-template-parts/footer.html
+++ b/quadrat-yellow/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/quadrat/block-template-parts/footer.html b/quadrat/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/quadrat/block-template-parts/footer.html
+++ b/quadrat/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file
diff --git a/zoologist/block-template-parts/footer.html b/zoologist/block-template-parts/footer.html
index 274b0e1a13..27ba0dac60 100644
--- a/zoologist/block-template-parts/footer.html
+++ b/zoologist/block-template-parts/footer.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"className":"site-footer","style":{"spacing":{"padding":{"top":"150px","bottom":"150px"}}}} -->
-<div class="wp-block-group site-footer" style="padding-top:150px;padding-bottom: 150px">
+<!-- wp:spacer {"height":70} -->
+<div style="height:70px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-simple"} /-->
 
-</div>
-<!-- /wp:group -->
+<!-- wp:spacer {"height":120} -->
+<div style="height:120px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
\ No newline at end of file

From 2f90c57c318788330f45c12d01326025e6d1b966 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 12:34:42 +0100
Subject: [PATCH 07/12] Kingsley and Mayland footers

---
 blockbase/inc/block-patterns.php              |  6 +++--
 blockbase/inc/patterns/footer-primary.php     | 25 +++++++++++++++++++
 blockbase/inc/patterns/footer-simple.php      |  4 +--
 blockbase/inc/patterns/footer-small.php       | 23 +++++++++++++++++
 kingsley/block-template-parts/footer.html     |  6 +----
 .../block-template-parts/footer.html          | 25 +------------------
 6 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 blockbase/inc/patterns/footer-primary.php
 create mode 100644 blockbase/inc/patterns/footer-small.php

diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 733a3af086..4fdddb0274 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -18,10 +18,12 @@ function blockbase_register_block_patterns() {
 		if ( function_exists( 'register_block_pattern' ) ) {
 			$block_patterns = array(
 				'404',
-				'footer-simple',
 				'footer-columns',
-				'footer-vertical-menu',
+				'footer-primary',
 				'footer-separator',
+				'footer-simple',
+				'footer-small',
+				'footer-vertical-menu',
 			);
 
 			foreach ( $block_patterns as $block_pattern ) {
diff --git a/blockbase/inc/patterns/footer-primary.php b/blockbase/inc/patterns/footer-primary.php
new file mode 100644
index 0000000000..0fdce86cd3
--- /dev/null
+++ b/blockbase/inc/patterns/footer-primary.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Footer with menu
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Footer with menu', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"style":{"spacing":{"padding":{"top":"32px","right":"32px","bottom":"32px","left":"32px"}}},"layout":{"inherit":false}} -->
+	<div class="wp-block-group" style="padding-top:32px;padding-right:32px;padding-bottom:32px;padding-left:32px"><!-- wp:group {"layout":{"type":"flex","justifyContent":"space-between"}} -->
+	<div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex"}} -->
+	<div class="wp-block-group"><!-- wp:site-title {"fontSize":"small"} /-->
+	
+	<!-- wp:paragraph {"fontSize":"small"} -->
+	<p class="has-small-font-size"><meta charset="utf-8">Proudly Powered by <a rel="nofollow" href="https://wordpress.org">WordPress</a></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:group -->
+	
+	<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} /--></div>
+	<!-- /wp:group --></div>
+	<!-- /wp:group -->',
+);
diff --git a/blockbase/inc/patterns/footer-simple.php b/blockbase/inc/patterns/footer-simple.php
index f7f7f0decc..4b8d07dd2d 100644
--- a/blockbase/inc/patterns/footer-simple.php
+++ b/blockbase/inc/patterns/footer-simple.php
@@ -11,8 +11,8 @@
 	'blockTypes' => array( 'core/template-part/footer' ),
 	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
 	<div class="wp-block-group">
-		<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","right":"0px","bottom":"30px","left":"0px"}}}} -->
-		<div class="wp-block-group" style="padding-top:80px;padding-right:0px;padding-bottom:30px;padding-left:0px">
+		<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","bottom":"30px"}}}} -->
+		<div class="wp-block-group" style="padding-top:80px;padding-bottom:30px">
 			<!-- wp:paragraph {"align":"center"} -->
 			<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
 			<!-- /wp:paragraph -->
diff --git a/blockbase/inc/patterns/footer-small.php b/blockbase/inc/patterns/footer-small.php
new file mode 100644
index 0000000000..2db4d1494a
--- /dev/null
+++ b/blockbase/inc/patterns/footer-small.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Small footer
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Small footer', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
+	<div class="wp-block-group">
+		<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}}} -->
+		<div class="wp-block-group" style="padding-top:20px;padding-bottom:20px">
+			<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
+			<p class="has-text-align-center has-small-font-size">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+			<!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->',
+);
diff --git a/kingsley/block-template-parts/footer.html b/kingsley/block-template-parts/footer.html
index f33536ec32..45e7b2ce8d 100644
--- a/kingsley/block-template-parts/footer.html
+++ b/kingsley/block-template-parts/footer.html
@@ -1,5 +1 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}}} -->
-<div class="wp-block-group" style="padding-top:20px;padding-bottom:20px"><!-- wp:paragraph {"align":"center","fontSize":"small"} -->
-<p class="has-text-align-center has-small-font-size"><a href="https://wordpress.com">Proudly Powered by WordPress.com.</a></p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:pattern {"slug":"blockbase/footer-small"} /-->
\ No newline at end of file
diff --git a/mayland-blocks/block-template-parts/footer.html b/mayland-blocks/block-template-parts/footer.html
index 5cca5f7e1a..5e25bfef66 100644
--- a/mayland-blocks/block-template-parts/footer.html
+++ b/mayland-blocks/block-template-parts/footer.html
@@ -1,24 +1 @@
-<!-- wp:spacer {"height":32} -->
-<div style="height:32px" aria-hidden="true" class="wp-block-spacer"></div>
-<!-- /wp:spacer -->
-
-<!-- wp:columns {"verticalAlignment":"center"} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center"} -->
-<div class="wp-block-column is-vertically-aligned-center"><!-- wp:site-title {"textColor":"foreground-light","fontSize":"small"} /--></div>
-<!-- /wp:column -->
-
-<!-- wp:column {"verticalAlignment":"center"} -->
-<div class="wp-block-column is-vertically-aligned-center">
-    <!-- wp:navigation {"textColor":"foreground-light","overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"fontSize":"small"} -->
-        <!-- wp:navigation-link {"label":"Home","url":"#"} /-->
-        <!-- wp:navigation-link {"label":"Services","url":"#"} /-->
-        <!-- wp:navigation-link {"label":"Portfolio","url":"#"} /-->
-        <!-- wp:navigation-link {"label":"Contact","url":"#"} /-->
-    <!-- /wp:navigation -->
-</div>
-<!-- /wp:column --></div>
-<!-- /wp:columns -->
-
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
-<!-- /wp:paragraph -->
+<!-- wp:pattern {"slug":"blockbase/footer-primary"} /-->
\ No newline at end of file

From c36e1b4bf9ecba7b40cf88d51d738323ee43388b Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 13:10:51 +0100
Subject: [PATCH 08/12] Seedlet blocks footer

---
 blockbase/inc/block-patterns.php              |  1 +
 blockbase/inc/patterns/footer-left.php        | 24 +++++++++++++++++++
 .../block-template-parts/footer.html          | 24 +------------------
 3 files changed, 26 insertions(+), 23 deletions(-)
 create mode 100644 blockbase/inc/patterns/footer-left.php

diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index 4fdddb0274..aa67354f3e 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -19,6 +19,7 @@ function blockbase_register_block_patterns() {
 			$block_patterns = array(
 				'404',
 				'footer-columns',
+				'footer-left',
 				'footer-primary',
 				'footer-separator',
 				'footer-simple',
diff --git a/blockbase/inc/patterns/footer-left.php b/blockbase/inc/patterns/footer-left.php
new file mode 100644
index 0000000000..2e657beb90
--- /dev/null
+++ b/blockbase/inc/patterns/footer-left.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Left aligned footer
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Left aligned footer', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"30px"}}},"layout":{"inherit":true}} -->
+	<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:30px">
+	<!-- wp:navigation {"__unstableLocation":"primary","fontSize":"small"} /-->
+	
+	<!-- wp:group {"layout":{"type":"flex","allowOrientation":false}} -->
+	<div class="wp-block-group"><!-- wp:site-title {"fontSize":"small"} /-->
+	
+	<!-- wp:paragraph {"fontSize":"small","fontFamily":"heading-font"} -->
+	<p class="has-text-align-left has-small-font-size has-heading-font-font-family">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+	<!-- /wp:paragraph --></div>
+	<!-- /wp:group --></div>
+	<!-- /wp:group -->',
+);
diff --git a/seedlet-blocks/block-template-parts/footer.html b/seedlet-blocks/block-template-parts/footer.html
index f80a897618..3298034279 100644
--- a/seedlet-blocks/block-template-parts/footer.html
+++ b/seedlet-blocks/block-template-parts/footer.html
@@ -1,23 +1 @@
-<!-- wp:group {"layout":{"inherit":true},"align":"full"} -->
-<div class="wp-block-group">
-	<!-- wp:spacer {"height":30} -->
-	<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-
-	<!-- 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:spacer {"height":30} -->
-	<div style="height:30px" aria-hidden="true" class="wp-block-spacer"></div>
-	<!-- /wp:spacer -->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- wp:pattern {"slug":"blockbase/footer-left"} /-->
\ No newline at end of file

From 9f076eda9078ffc507a53e0e0522a0c0b5e6fa5b Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 13:19:58 +0100
Subject: [PATCH 09/12] fix vertical footer pattern

---
 blockbase/inc/patterns/footer-vertical-menu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockbase/inc/patterns/footer-vertical-menu.php b/blockbase/inc/patterns/footer-vertical-menu.php
index adb6329d50..c8e24ebf6a 100644
--- a/blockbase/inc/patterns/footer-vertical-menu.php
+++ b/blockbase/inc/patterns/footer-vertical-menu.php
@@ -11,8 +11,8 @@
 	'blockTypes' => array( 'core/template-part/footer' ),
 	'content'    => '<!-- wp:group {"layout":{"inherit":"true"}} -->
 	<div class="wp-block-group">
-		<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"var(--wp--custom--gap--horizontal"}}}} -->
-		<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: var(--wp--custom--gap--horizontal);">	<!-- wp:group -->
+		<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"min(30px, 5vw)"}}}} -->
+		<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: min(30px, 5vw)">	<!-- wp:group -->
 			<div class="wp-block-group">
 				<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
 			</div>

From 0afada4bfe67d0be35f111e1871dd75b1309c7f0 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 13:23:23 +0100
Subject: [PATCH 10/12] added spacer to videomaker

---
 blockbase/inc/patterns/footer-vertical-menu.php   | 4 ++--
 videomaker-white/block-template-parts/footer.html | 3 +++
 videomaker/block-template-parts/footer.html       | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/blockbase/inc/patterns/footer-vertical-menu.php b/blockbase/inc/patterns/footer-vertical-menu.php
index c8e24ebf6a..af2dfcb2be 100644
--- a/blockbase/inc/patterns/footer-vertical-menu.php
+++ b/blockbase/inc/patterns/footer-vertical-menu.php
@@ -11,8 +11,8 @@
 	'blockTypes' => array( 'core/template-part/footer' ),
 	'content'    => '<!-- wp:group {"layout":{"inherit":"true"}} -->
 	<div class="wp-block-group">
-		<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"170px","bottom":"min(30px, 5vw)"}}}} -->
-		<div class="wp-block-group alignwide" style="padding-top: 170px;padding-bottom: min(30px, 5vw)">	<!-- wp:group -->
+		<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"30px","bottom":"min(30px, 5vw)"}}}} -->
+		<div class="wp-block-group alignwide" style="padding-top: 30px;padding-bottom: min(30px, 5vw)">	<!-- wp:group -->
 			<div class="wp-block-group">
 				<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
 			</div>
diff --git a/videomaker-white/block-template-parts/footer.html b/videomaker-white/block-template-parts/footer.html
index a70d82dc89..2326858ac3 100644
--- a/videomaker-white/block-template-parts/footer.html
+++ b/videomaker-white/block-template-parts/footer.html
@@ -1 +1,4 @@
+<!-- wp:spacer {"height":140} -->
+<div style="height:140px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 <!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file
diff --git a/videomaker/block-template-parts/footer.html b/videomaker/block-template-parts/footer.html
index a70d82dc89..2326858ac3 100644
--- a/videomaker/block-template-parts/footer.html
+++ b/videomaker/block-template-parts/footer.html
@@ -1 +1,4 @@
+<!-- wp:spacer {"height":140} -->
+<div style="height:140px" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
 <!-- wp:pattern {"slug":"blockbase/footer-vertical-menu"} /-->
\ No newline at end of file

From 9b45e815c1d2a4e065e885f35064c3cacceba1c1 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 22 Dec 2021 13:40:43 +0100
Subject: [PATCH 11/12] block style for search and new footer pattern

---
 blockbase/assets/ponyfill.css            | 12 +++++++++++
 blockbase/inc/block-patterns.php         |  1 +
 blockbase/inc/block-styles.php           |  8 ++++++++
 blockbase/inc/patterns/footer-search.php | 26 ++++++++++++++++++++++++
 blockbase/sass/blocks/_search.scss       |  8 ++++++++
 5 files changed, 55 insertions(+)
 create mode 100644 blockbase/inc/patterns/footer-search.php

diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index 8a8baabcc7..171e6f1880 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -907,6 +907,10 @@ div.wp-block-query-pagination .wp-block-query-pagination-numbers .current {
 	font-style: var(--wp--custom--quote--citation--typography--font-style);
 }
 
+.wp-block-search {
+	/* Block Styles */
+}
+
 .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper {
 	padding: var(--wp--custom--form--border--width);
 	border: var(--wp--custom--form--border--width) var(--wp--custom--form--border--style) var(--wp--custom--form--border--color);
@@ -982,6 +986,14 @@ div.wp-block-query-pagination .wp-block-query-pagination-numbers .current {
 	opacity: 0.66;
 }
 
+.wp-block-search.is-style-small-search {
+	--wp--custom--button--typography--font-size: calc( 0.8 * var(--wp--preset--font-size--small));
+}
+
+.wp-block-search.is-style-small-search .wp-block-search__input {
+	padding: calc( 0.5 * var(--wp--custom--form--padding));
+}
+
 .wp-block-separator {
 	opacity: var(--wp--custom--separator--opacity);
 }
diff --git a/blockbase/inc/block-patterns.php b/blockbase/inc/block-patterns.php
index aa67354f3e..086f676bba 100644
--- a/blockbase/inc/block-patterns.php
+++ b/blockbase/inc/block-patterns.php
@@ -21,6 +21,7 @@ function blockbase_register_block_patterns() {
 				'footer-columns',
 				'footer-left',
 				'footer-primary',
+				'footer-search',
 				'footer-separator',
 				'footer-simple',
 				'footer-small',
diff --git a/blockbase/inc/block-styles.php b/blockbase/inc/block-styles.php
index b32f0834f4..a1707f2163 100644
--- a/blockbase/inc/block-styles.php
+++ b/blockbase/inc/block-styles.php
@@ -49,6 +49,14 @@ function blockbase_register_block_styles() {
 					'style_handle' => 'post-category-icon',
 				)
 			);
+			register_block_style(
+				'core/search',
+				array(
+					'name'         => 'small-search',
+					'label'        => __( 'Small', 'blockbase' ),
+					'style_handle' => 'small-search',
+				)
+			);
 		}
 	}
 endif;
diff --git a/blockbase/inc/patterns/footer-search.php b/blockbase/inc/patterns/footer-search.php
new file mode 100644
index 0000000000..62ccf16772
--- /dev/null
+++ b/blockbase/inc/patterns/footer-search.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Footer with Search Block
+ *
+ * @package Blockbase
+ */
+
+return array(
+	'title'      => __( 'Footer with Search Block', 'blockbase' ),
+	'categories' => array( 'blockbase' ),
+	'blockTypes' => array( 'core/template-part/footer' ),
+	'content'    => '<!-- wp:group {"layout":{"inherit":true}} -->
+	<div class="wp-block-group">
+		<!-- wp:group {"style":{"spacing":{"padding":{"top":"80px","bottom":"30px"}}}} -->
+		<div class="wp-block-group" style="padding-top:80px;padding-bottom:30px">
+			<!-- wp:group {"style":{"spacing":{"padding":{"bottom":"30px"}}}} -->
+			<div class="wp-block-group" style="padding-bottom:30px"><!-- wp:search {"label":"Search","showLabel":false,"buttonText":"Search","className":"is-style-small-search"} /--></div>
+			<!-- /wp:group -->
+			<!-- wp:paragraph {"align":"center"} -->
+			<p class="has-text-align-center">Proudly Powered by <a href="https://wordpress.org" rel="nofollow">WordPress</a></p>
+			<!-- /wp:paragraph -->
+		</div>
+		<!-- /wp:group -->
+	</div>
+	<!-- /wp:group -->',
+);
diff --git a/blockbase/sass/blocks/_search.scss b/blockbase/sass/blocks/_search.scss
index bf113f44c2..ac299fb4b6 100644
--- a/blockbase/sass/blocks/_search.scss
+++ b/blockbase/sass/blocks/_search.scss
@@ -33,4 +33,12 @@
 			opacity: 0.66;
 		}
 	}
+
+	/* Block Styles */
+	&.is-style-small-search{
+		--wp--custom--button--typography--font-size: calc( 0.8 * var(--wp--preset--font-size--small));
+		.wp-block-search__input {
+			padding: calc( 0.5 * var(--wp--custom--form--padding) );
+		}
+	}
 }

From 3705f72d2408f9b62ac356268cfca3c93289635a Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Mon, 10 Jan 2022 16:53:03 +0100
Subject: [PATCH 12/12] tagline on columns pattern

---
 blockbase/inc/patterns/footer-columns.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/blockbase/inc/patterns/footer-columns.php b/blockbase/inc/patterns/footer-columns.php
index b86199425a..de807b8c92 100644
--- a/blockbase/inc/patterns/footer-columns.php
+++ b/blockbase/inc/patterns/footer-columns.php
@@ -17,9 +17,7 @@
 		<div class="wp-block-columns"><!-- wp:column -->
 		<div class="wp-block-column"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"large"} /-->
 
-		<!-- wp:paragraph {"fontSize":"small"} -->
-		<p class="has-small-font-size">' . esc_html__( "Skatepark's coaches will work with you to develop and improve your skating abilities.", 'blockbase' ) . '</p>
-		<!-- /wp:paragraph -->
+		<!-- wp:site-tagline {"fontSize":"small"} /-->
 
 		<!-- wp:social-links {"iconColor":"primary","iconColorValue":"var(--wp--custom--color--foreground)","className":"is-style-logos-only"} -->
 		<ul class="wp-block-social-links has-icon-color is-style-logos-only"><!-- wp:social-link {"url":"http://twitter.com","service":"twitter"} /-->