From f82c2b13f4dc6c5e091c2a6a3096a455c5ced121 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Thu, 27 May 2021 10:57:14 +0100
Subject: [PATCH] Blockbase: Move block styles to theme.json

---
 blockbase/assets/ponyfill.css    | 1 -
 blockbase/sass/blocks/_list.scss | 1 -
 blockbase/theme.json             | 3 ---
 mayland-blocks/theme.json        | 3 ---
 quadrat/theme.json               | 3 ---
 seedlet-blocks/assets/theme.css  | 2 ++
 seedlet-blocks/theme.json        | 3 ---
 7 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index a597b90a87..4968a07c8c 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -334,7 +334,6 @@ input[type=checkbox] + label {
 
 ul,
 ol {
-	font-family: var(--wp--custom--list--typography--font-family);
 	padding-left: var(--wp--custom--list--spacing--padding--left);
 }
 
diff --git a/blockbase/sass/blocks/_list.scss b/blockbase/sass/blocks/_list.scss
index 057d1c857e..2177372d7b 100644
--- a/blockbase/sass/blocks/_list.scss
+++ b/blockbase/sass/blocks/_list.scss
@@ -1,5 +1,4 @@
 ul,
 ol {
-	font-family: var(--wp--custom--list--typography--font-family);
 	padding-left: var(--wp--custom--list--spacing--padding--left);
 }
diff --git a/blockbase/theme.json b/blockbase/theme.json
index 8d0fd6857a..ea4517385c 100644
--- a/blockbase/theme.json
+++ b/blockbase/theme.json
@@ -157,9 +157,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
diff --git a/mayland-blocks/theme.json b/mayland-blocks/theme.json
index be1d73181a..cbf5689a8a 100644
--- a/mayland-blocks/theme.json
+++ b/mayland-blocks/theme.json
@@ -165,9 +165,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
diff --git a/quadrat/theme.json b/quadrat/theme.json
index c462c55e30..88dcff142c 100644
--- a/quadrat/theme.json
+++ b/quadrat/theme.json
@@ -153,9 +153,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
diff --git a/seedlet-blocks/assets/theme.css b/seedlet-blocks/assets/theme.css
index 06deb383fd..96b10be810 100644
--- a/seedlet-blocks/assets/theme.css
+++ b/seedlet-blocks/assets/theme.css
@@ -175,6 +175,8 @@
 	line-height: 30px;
 }
 
+/* NOTE: This can be removed when the rendering of the Navigation block, rendered with a Classic data source (by way of __unstableLocation), 
+is passed all of the block attributes on the block definition in the template. */
 .wp-block-navigation__container {
 	justify-content: center;
 }
diff --git a/seedlet-blocks/theme.json b/seedlet-blocks/theme.json
index ad4b764c90..71ebbfbfa6 100644
--- a/seedlet-blocks/theme.json
+++ b/seedlet-blocks/theme.json
@@ -198,9 +198,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"