diff --git a/packages/block-library/src/audio/block.json b/packages/block-library/src/audio/block.json index b872a3acebdcc6..fc2b01d214cb4a 100644 --- 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 index 03e2b5e04333ab..2744d36e74ca62 100644 --- 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 index 59baf59b53d742..d92f9173cb223c 100644 --- 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 index f8d8c3206d0170..7257b54cf20faa 100644 --- 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 index a23337bcc55c11..e809a783b9c810 100644 --- 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 index 143dacea3eb8be..62edb882be0c93 100644 --- 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 index 95ed74e1ee2ffe..d5b2cfb0e83e94 100644 --- 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 index 6fb8a791647227..19835c8da80aa1 100644 --- 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 index 10ba8908a5dbc3..d1f32ff066e2ac 100644 --- 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 index 1050fe2d69f156..1450065e402760 100644 --- 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 index 174535bdf09163..cdc95af0b02c29 100644 --- 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; +}