Blockbase: Move block styles to theme.json

Automattic · Jun 17, 2021 · d69cbcb · d69cbcb
1 parent 03c01e4
commit d69cbcb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 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--font-family);
 	padding-left: var(--wp--custom--list--padding--left);
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)"