From d69cbcb33dd3aa1fe0a41f505575ee0444792a60 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             | 4 +++-
 mayland-blocks/theme.json        | 4 +++-
 quadrat/child-theme.json         | 5 -----
 quadrat/theme.json               | 9 +++------
 seedlet-blocks/theme.json        | 4 +++-
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index 1168613c29..7452d92dbb 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--font-family);
 	padding-left: var(--wp--custom--list--padding--left);
 }
 
diff --git a/blockbase/sass/blocks/_list.scss b/blockbase/sass/blocks/_list.scss
index a8460a4552..b318561673 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--font-family);
 	padding-left: var(--wp--custom--list--padding--left);
 }
diff --git a/blockbase/theme.json b/blockbase/theme.json
index c167626bd1..f195e70ef6 100644
--- a/blockbase/theme.json
+++ b/blockbase/theme.json
@@ -143,7 +143,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -320,6 +319,9 @@
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"
diff --git a/mayland-blocks/theme.json b/mayland-blocks/theme.json
index 444c5dacb2..949e7ab298 100644
--- a/mayland-blocks/theme.json
+++ b/mayland-blocks/theme.json
@@ -141,7 +141,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -340,6 +339,9 @@
 					"lineHeight": "var(--wp--custom--line-height--headings)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--small)"
diff --git a/quadrat/child-theme.json b/quadrat/child-theme.json
index 0fce8eda12..21bde2bdfa 100644
--- a/quadrat/child-theme.json
+++ b/quadrat/child-theme.json
@@ -246,11 +246,6 @@
 					"lineHeight": "var(--wp--custom--line-height--headings--h1)"
 				}
 			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
-				}
-			},
 			"core/quote": {
 				"border": {
 					"width": "0px"
diff --git a/quadrat/theme.json b/quadrat/theme.json
index cb5b8971b5..37ed92c709 100644
--- a/quadrat/theme.json
+++ b/quadrat/theme.json
@@ -139,7 +139,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -344,6 +343,9 @@
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "18px"
@@ -442,11 +444,6 @@
 					}
 				}
 			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
-				}
-			},
 			"core/query-pagination": {
 				"typography": {
 					"fontSize": "18px",
diff --git a/seedlet-blocks/theme.json b/seedlet-blocks/theme.json
index 74c6f9a756..c1a1c289a9 100644
--- a/seedlet-blocks/theme.json
+++ b/seedlet-blocks/theme.json
@@ -179,7 +179,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -370,6 +369,9 @@
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "var(--wp--preset--font-size--normal)"