Blockbase: Move block styles to theme.json

Automattic · May 27, 2021 · 8d5b0b9 · 8d5b0b9
1 parent 5c1e93b
commit 8d5b0b9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {