Blockbase: Move block styles to theme.json

Automattic · Jun 28, 2021 · 71fb9f5 · 71fb9f5
1 parent c562229
commit 71fb9f5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 27 deletions.
diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
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--typography--font-family);
 	padding-left: var(--wp--custom--list--spacing--padding--left);
 }
diff --git 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) )"
@@ -333,6 +330,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
@@ -165,9 +165,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
@@ -364,6 +361,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/quadrat/assets/theme.css b/quadrat/assets/theme.css
diff --git a/quadrat/child-theme.json b/quadrat/child-theme.json
@@ -221,11 +221,6 @@
 					"lineHeight": 1.2
 				}
 			},
-			"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
@@ -153,9 +153,6 @@
 				}
 			},
 			"list": {
-				"typography": {
-					"fontFamily": "var(--wp--custom--body--typography--font-family)"
-				},
 				"spacing": {
 					"padding": {
 						"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
@@ -349,6 +346,9 @@
 					"lineHeight": "var(--wp--custom--heading--typography--line-height)"
 				}
 			},
+			"core/list": {
+				"fontFamily": "var(--wp--custom--font-family--base)"
+			},
 			"core/navigation": {
 				"typography": {
 					"fontSize": "18px"
@@ -448,11 +448,6 @@
 					}
 				}
 			},
-			"list": {
-				"padding": {
-					"left": "calc( 2 * var(--wp--custom--margin--horizontal) )"
-				}
-			},
 			"core/query-pagination": {
 				"typography": {
 					"fontSize": "18px",

diff --git a/seedlet-blocks/assets/theme.css b/seedlet-blocks/assets/theme.css
diff --git 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) )"
@@ -393,6 +390,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)"