Move margins to theme.scss (#43813)

WordPress · Sep 6, 2022 · fd3b08b · fd3b08b
1 parent ee52971
commit fd3b08b
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 27 deletions.
diff --git a/packages/block-library/src/audio/block.json b/packages/block-library/src/audio/block.json
@@ -44,11 +44,6 @@
 	"supports": {
 		"anchor": true,
 		"align": true,
-		"__experimentalStyle": {
-			"spacing": {
-				"margin": "0 0 1em 0"
-			}
-		},
 		"spacing": {
 			"margin": true,
 			"padding": true

diff --git a/packages/block-library/src/audio/theme.scss b/packages/block-library/src/audio/theme.scss
@@ -1,3 +1,7 @@
 .wp-block-audio figcaption {
 	@include caption-style-theme();
 }
+
+.wp-block-audio {
+	margin: 0 0 1em 0;
+}
diff --git a/packages/block-library/src/common.scss b/packages/block-library/src/common.scss
@@ -154,3 +154,10 @@ html :where(img[class*="wp-image-"]) {
 	height: auto;
 	max-width: 100%;
 }
+
+/**
+ * Reset user agent styles for figure element margins.
+ */
+figure {
+	margin: 0 0 1em 0;
+}
diff --git a/packages/block-library/src/embed/block.json b/packages/block-library/src/embed/block.json
@@ -35,12 +35,7 @@
 		}
 	},
 	"supports": {
-		"align": true,
-		"__experimentalStyle": {
-			"spacing": {
-				"margin": "0 0 1em 0"
-			}
-		}
+		"align": true
 	},
 	"editorStyle": "wp-block-embed-editor",
 	"style": "wp-block-embed"

diff --git a/packages/block-library/src/embed/theme.scss b/packages/block-library/src/embed/theme.scss
@@ -1,3 +1,7 @@
 .wp-block-embed figcaption {
 	@include caption-style-theme();
 }
+
+.wp-block-embed {
+	margin: 0 0 1em 0;
+}
diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
@@ -100,11 +100,6 @@
 				"radius": true,
 				"width": true
 			}
-		},
-		"__experimentalStyle": {
-			"spacing": {
-				"margin": "0 0 1em 0"
-			}
 		}
 	},
 	"styles": [

diff --git a/packages/block-library/src/image/theme.scss b/packages/block-library/src/image/theme.scss
@@ -1,3 +1,7 @@
 .wp-block-image figcaption {
 	@include caption-style-theme();
 }
+
+.wp-block-image {
+	margin: 0 0 1em 0;
+}
diff --git a/packages/block-library/src/table/block.json b/packages/block-library/src/table/block.json
@@ -160,12 +160,7 @@
 				"width": true
 			}
 		},
-		"__experimentalSelector": ".wp-block-table > table",
-		"__experimentalStyle": {
-			"spacing": {
-				"margin": "0 0 1em 0"
-			}
-		}
+		"__experimentalSelector": ".wp-block-table > table"
 	},
 	"styles": [
 		{

diff --git a/packages/block-library/src/table/theme.scss b/packages/block-library/src/table/theme.scss
@@ -1,4 +1,6 @@
 .wp-block-table {
+	margin: "0 0 1em 0";
+
 	thead {
 		border-bottom: 3px solid;
 	}

diff --git a/packages/block-library/src/video/block.json b/packages/block-library/src/video/block.json
@@ -80,11 +80,6 @@
 		"spacing": {
 			"margin": true,
 			"padding": true
-		},
-		"__experimentalStyle": {
-			"spacing": {
-				"margin": "0 0 1em 0"
-			}
 		}
 	},
 	"editorStyle": "wp-block-video-editor",

diff --git a/packages/block-library/src/video/theme.scss b/packages/block-library/src/video/theme.scss
@@ -1,3 +1,7 @@
 .wp-block-video figcaption {
 	@include caption-style-theme();
 }
+
+.wp-block-video {
+	margin: 0 0 1em 0;
+}