From 09775a0194e75db55e36f178b8b52ff64f99e0f3 Mon Sep 17 00:00:00 2001 From: Carolina Nymark Date: Tue, 6 Sep 2022 14:24:32 +0200 Subject: [PATCH 1/4] Add spacing support to the comment pagination blocks --- docs/reference-guides/core-blocks.md | 8 ++++---- .../block-library/src/comments-pagination-next/block.json | 4 ++++ .../src/comments-pagination-numbers/block.json | 4 ++++ .../src/comments-pagination-previous/block.json | 4 ++++ packages/block-library/src/comments-pagination/block.json | 4 ++++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 8dc2d9c42fad5d..5c7c0d446e07fb 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -185,7 +185,7 @@ Displays a paginated navigation to next/previous set of comments, when applicabl - **Name:** core/comments-pagination - **Category:** theme -- **Supports:** align, color (background, gradients, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ +- **Supports:** align, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ - **Attributes:** paginationArrow ## Next Page @@ -194,7 +194,7 @@ Displays the next comment's page link. ([Source](https://github.com/WordPress/gu - **Name:** core/comments-pagination-next - **Category:** theme -- **Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ +- **Supports:** color (background, gradients, ~~text~~), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ - **Attributes:** label ## Page Numbers @@ -203,7 +203,7 @@ Displays a list of page numbers for comments pagination. ([Source](https://githu - **Name:** core/comments-pagination-numbers - **Category:** theme -- **Supports:** typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ +- **Supports:** spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ - **Attributes:** ## Previous Page @@ -212,7 +212,7 @@ Displays the previous comment's page link. ([Source](https://github.com/WordPres - **Name:** core/comments-pagination-previous - **Category:** theme -- **Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ +- **Supports:** color (background, gradients, ~~text~~), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ - **Attributes:** label ## Comments Title diff --git a/packages/block-library/src/comments-pagination-next/block.json b/packages/block-library/src/comments-pagination-next/block.json index 128e08128dca89..b1ad4ecc117eb5 100644 --- a/packages/block-library/src/comments-pagination-next/block.json +++ b/packages/block-library/src/comments-pagination-next/block.json @@ -23,6 +23,10 @@ "background": true } }, + "spacing": { + "margin": true, + "padding": true + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination-numbers/block.json b/packages/block-library/src/comments-pagination-numbers/block.json index e84aff63b043fe..466a6f58b1b92f 100644 --- a/packages/block-library/src/comments-pagination-numbers/block.json +++ b/packages/block-library/src/comments-pagination-numbers/block.json @@ -11,6 +11,10 @@ "supports": { "reusable": false, "html": false, + "spacing": { + "margin": true, + "padding": true + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination-previous/block.json b/packages/block-library/src/comments-pagination-previous/block.json index 9fb2960b9d1e12..35405831a77318 100644 --- a/packages/block-library/src/comments-pagination-previous/block.json +++ b/packages/block-library/src/comments-pagination-previous/block.json @@ -23,6 +23,10 @@ "background": true } }, + "spacing": { + "margin": true, + "padding": true + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination/block.json b/packages/block-library/src/comments-pagination/block.json index ffa2828912f26b..d4943cc548d918 100644 --- a/packages/block-library/src/comments-pagination/block.json +++ b/packages/block-library/src/comments-pagination/block.json @@ -36,6 +36,10 @@ "type": "flex" } }, + "spacing": { + "margin": true, + "padding": true + }, "typography": { "fontSize": true, "lineHeight": true, From 179ca7e2571adf7595b81d4ed1416e5628fe3d04 Mon Sep 17 00:00:00 2001 From: Carolina Nymark Date: Wed, 7 Sep 2022 06:21:46 +0200 Subject: [PATCH 2/4] Move default margin to block.json --- .../block-library/src/comments-pagination-next/block.json | 8 ++++++++ .../src/comments-pagination-numbers/block.json | 8 ++++++++ .../src/comments-pagination-previous/block.json | 8 ++++++++ packages/block-library/src/comments-pagination/style.scss | 4 ---- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/packages/block-library/src/comments-pagination-next/block.json b/packages/block-library/src/comments-pagination-next/block.json index b1ad4ecc117eb5..2d4fb4a019e508 100644 --- a/packages/block-library/src/comments-pagination-next/block.json +++ b/packages/block-library/src/comments-pagination-next/block.json @@ -27,6 +27,14 @@ "margin": true, "padding": true }, + "__experimentalStyle": { + "spacing": { + "margin": { + "right": "0.5em", + "bottom": "0.5em" + } + } + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination-numbers/block.json b/packages/block-library/src/comments-pagination-numbers/block.json index 466a6f58b1b92f..6a401652e3ae6f 100644 --- a/packages/block-library/src/comments-pagination-numbers/block.json +++ b/packages/block-library/src/comments-pagination-numbers/block.json @@ -15,6 +15,14 @@ "margin": true, "padding": true }, + "__experimentalStyle": { + "spacing": { + "margin": { + "right": "0.5em", + "bottom": "0.5em" + } + } + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination-previous/block.json b/packages/block-library/src/comments-pagination-previous/block.json index 35405831a77318..bd6e33eae0d188 100644 --- a/packages/block-library/src/comments-pagination-previous/block.json +++ b/packages/block-library/src/comments-pagination-previous/block.json @@ -27,6 +27,14 @@ "margin": true, "padding": true }, + "__experimentalStyle": { + "spacing": { + "margin": { + "right": "0.5em", + "bottom": "0.5em" + } + } + }, "typography": { "fontSize": true, "lineHeight": true, diff --git a/packages/block-library/src/comments-pagination/style.scss b/packages/block-library/src/comments-pagination/style.scss index c6b5d9a0a29e91..49f80f1577e58f 100644 --- a/packages/block-library/src/comments-pagination/style.scss +++ b/packages/block-library/src/comments-pagination/style.scss @@ -4,10 +4,6 @@ $pagination-margin: 0.5em; > .wp-block-comments-pagination-next, > .wp-block-comments-pagination-previous, > .wp-block-comments-pagination-numbers { - /*rtl:ignore*/ - margin-right: $pagination-margin; - margin-bottom: $pagination-margin; - &:last-child { /*rtl:ignore*/ margin-right: 0; From 63eb6ac39ec73aa285171cc85d62d7f71db00d6f Mon Sep 17 00:00:00 2001 From: Carolina Nymark Date: Wed, 19 Oct 2022 11:46:41 +0200 Subject: [PATCH 3/4] Update block.json --- .../block-library/src/comments-pagination-numbers/block.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-library/src/comments-pagination-numbers/block.json b/packages/block-library/src/comments-pagination-numbers/block.json index ea659ca865f686..6ee4222a6aedcc 100644 --- a/packages/block-library/src/comments-pagination-numbers/block.json +++ b/packages/block-library/src/comments-pagination-numbers/block.json @@ -21,6 +21,7 @@ "right": "0.5em", "bottom": "0.5em" } + } }, "color": { "gradients": true, From 8bcc71089f09a1aef9f0148fd3ec6d6753e5dd9e Mon Sep 17 00:00:00 2001 From: Carolina Nymark Date: Wed, 12 Apr 2023 06:42:59 +0200 Subject: [PATCH 4/4] Update editor.scss --- .../src/comments-pagination/editor.scss | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/packages/block-library/src/comments-pagination/editor.scss b/packages/block-library/src/comments-pagination/editor.scss index dbf7e60ff65c06..629a09f09507b1 100644 --- a/packages/block-library/src/comments-pagination/editor.scss +++ b/packages/block-library/src/comments-pagination/editor.scss @@ -1,5 +1,3 @@ -$pagination-margin: 0.5em; - // Center flex items. This has an equivalent in style.scss. .wp-block[data-align="center"] > .wp-block-comments-pagination { justify-content: center; @@ -8,27 +6,5 @@ $pagination-margin: 0.5em; .editor-styles-wrapper { .wp-block-comments-pagination { max-width: 100%; - &.block-editor-block-list__layout { - margin: 0; - } - } -} - -.wp-block-comments-pagination { - > .wp-block-comments-pagination-next, - > .wp-block-comments-pagination-previous, - > .wp-block-comments-pagination-numbers { - // Override editor auto block margins. - margin-left: 0; - margin-top: $pagination-margin; - - /*rtl:ignore*/ - margin-right: $pagination-margin; - margin-bottom: $pagination-margin; - - &:last-child { - /*rtl:ignore*/ - margin-right: 0; - } } }