From 8d5b0b9643047c1534e1d90166c0341b649241e6 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/experimental-theme.json      | 4 +++-
 blockbase/sass/blocks/_list.scss       | 1 -
 mayland-blocks/experimental-theme.json | 4 +++-
 quadrat/child-experimental-theme.json  | 5 -----
 quadrat/experimental-theme.json        | 9 +++------
 seedlet-blocks/experimental-theme.json | 6 ++++--
 7 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index ca792edf72..c5f09ad61c 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -357,7 +357,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/experimental-theme.json b/blockbase/experimental-theme.json
index 96f501b111..929418db12 100644
--- a/blockbase/experimental-theme.json
+++ b/blockbase/experimental-theme.json
@@ -133,7 +133,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -310,6 +309,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--small)"
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/mayland-blocks/experimental-theme.json b/mayland-blocks/experimental-theme.json
index d31a2b4590..b6a9dc5921 100644
--- a/mayland-blocks/experimental-theme.json
+++ b/mayland-blocks/experimental-theme.json
@@ -140,7 +140,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -339,6 +338,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-experimental-theme.json b/quadrat/child-experimental-theme.json
index 18e44e7e3d..3abf867ec2 100644
--- a/quadrat/child-experimental-theme.json
+++ b/quadrat/child-experimental-theme.json
@@ -237,11 +237,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/experimental-theme.json b/quadrat/experimental-theme.json
index 1067af672f..fa6cad6afa 100644
--- a/quadrat/experimental-theme.json
+++ b/quadrat/experimental-theme.json
@@ -140,7 +140,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -345,6 +344,9 @@
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "18px"
@@ -443,11 +445,6 @@
 					}
 				}
 			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
-				}
-			},
 			"core/query-pagination": {
 				"typography": {
 					"fontSize": "18px",
diff --git a/seedlet-blocks/experimental-theme.json b/seedlet-blocks/experimental-theme.json
index bdaf6cc7f2..304ee1660d 100644
--- a/seedlet-blocks/experimental-theme.json
+++ b/seedlet-blocks/experimental-theme.json
@@ -178,7 +178,6 @@
 				}
 			},
 			"list": {
-				"fontFamily": "var(--wp--custom--font-family--base)",
 				"padding": {
 					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
 				}
@@ -369,6 +368,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--small)"
@@ -434,7 +436,7 @@
 			},
 			"core/site-title": {
 				"typography": {
-					"fontSize": "60px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": 700
 				},
 				"color": {