Move blockGap values back to theme.json

DekodeInteraktiv · Jun 28, 2024 · e28fd05 · e28fd05
1 parent 25b10a9
commit e28fd05
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/packages/themes/block-theme/src/blocks/core/columns.css b/packages/themes/block-theme/src/blocks/core/columns.css
@@ -1,7 +1,3 @@
-.wp-block-columns.is-layout-flex {
-	gap: var(--wp--preset--spacing--50);
-}
-
 .wp-block-column.has-background,
 .wp-block-columns.has-background,
 .wp-block-columns.alignwide.has-background {

diff --git a/packages/themes/block-theme/src/blocks/core/group.css b/packages/themes/block-theme/src/blocks/core/group.css
@@ -1,7 +1,3 @@
-.wp-block-group.is-layout-flex {
-	gap: var(--wp--preset--spacing--50);
-}
-
 .wp-block-group.has-background,
 .wp-block-group.has-background.alignwide {
 	padding: var(--wp--preset--spacing--50);

diff --git a/packages/themes/block-theme/theme.json b/packages/themes/block-theme/theme.json
@@ -101,7 +101,8 @@
 			"customSpacingSize": false,
 			"margin": false,
 			"padding": false,
-			"spacingSizes": []
+			"spacingSizes": [],
+			"blockGap": true
 		}
 	},
 	"styles": {
@@ -118,7 +119,8 @@
 			"padding": {
 				"left": "1rem",
 				"right": "1rem"
-			}
+			},
+			"blockGap": "var(--wp--preset--spacing--80)"
 		},
 		"elements": {
 			"link": {
@@ -178,8 +180,20 @@
 					"radius": "unset"
 				}
 			},
+			"core/columns": {
+				"spacing": {
+					"blockGap": "var(--wp--preset--spacing--50)"
+				}
+			},
+			"core/group": {
+				"spacing": {
+					"blockGap": "var(--wp--preset--spacing--50)"
+				}
+			},
 			"core/buttons": {
-				"css": "&.is-layout-flex { gap: var(--wp--preset--spacing--50); }"
+				"spacing": {
+					"blockGap": "var(--wp--preset--spacing--50)"
+				}
 			},
 			"t2/ingress": {
 				"typography": {
@@ -188,7 +202,9 @@
 				}
 			},
 			"core/post-template": {
-				"css": "&.is-layout-grid { gap: var(--wp--preset--spacing--50); }"
+				"spacing": {
+					"blockGap": "var(--wp--preset--spacing--50)"
+				}
 			}
 		}
 	},