From eebbb5e004c801f01acffc663fcf189ff34e261c Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Sun, 4 Aug 2024 08:16:52 +0530 Subject: [PATCH 01/10] Commtent Content: Add Border Support --- .../block-library/src/comment-content/block.json | 15 ++++++++++++++- .../block-library/src/comment-content/style.scss | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/block-library/src/comment-content/block.json b/packages/block-library/src/comment-content/block.json index 9ac4b5453365b..026b4a6a0d083 100644 --- a/packages/block-library/src/comment-content/block.json +++ b/packages/block-library/src/comment-content/block.json @@ -35,12 +35,25 @@ "fontSize": true } }, + "__experimentalBorder": { + "radius": true, + "color": true, + "width": true, + "style": true, + "__experimentalDefaultControls": { + "radius": true, + "color": true, + "width": true, + "style": true + } + }, "spacing": { "padding": [ "horizontal", "vertical" ], "__experimentalDefaultControls": { "padding": true } }, - "html": false + "html": false, + "style": "wp-block-comment-content" } } diff --git a/packages/block-library/src/comment-content/style.scss b/packages/block-library/src/comment-content/style.scss index dd9c4b22ae99c..cc086a0ee7103 100644 --- a/packages/block-library/src/comment-content/style.scss +++ b/packages/block-library/src/comment-content/style.scss @@ -3,3 +3,8 @@ font-size: 0.875em; line-height: 1.5; } + +.wp-block-comment-content { + // This block has customizable padding, border-box makes that more predictable. + box-sizing: border-box; +} \ No newline at end of file From ccd0b8d21b8d8ab9acb25ce28ae25fbb176dffea Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Sun, 4 Aug 2024 08:50:58 +0530 Subject: [PATCH 02/10] fixed lint issue --- packages/block-library/src/comment-content/style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/comment-content/style.scss b/packages/block-library/src/comment-content/style.scss index cc086a0ee7103..a94048de6014d 100644 --- a/packages/block-library/src/comment-content/style.scss +++ b/packages/block-library/src/comment-content/style.scss @@ -7,4 +7,4 @@ .wp-block-comment-content { // This block has customizable padding, border-box makes that more predictable. box-sizing: border-box; -} \ No newline at end of file +} From 486f885374e5dc0c86a24bcf8c8afc61c9d99e54 Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Sun, 4 Aug 2024 09:10:42 +0530 Subject: [PATCH 03/10] Commtent Content: Add Border Support --- docs/reference-guides/core-blocks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 5beb712c80a11..e0be54c451267 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -138,7 +138,7 @@ Displays the contents of a comment. ([Source](https://github.com/WordPress/guten - **Name:** core/comment-content - **Category:** theme - **Ancestor:** core/comment-template -- **Supports:** color (background, gradients, link, text), spacing (padding), typography (fontSize, lineHeight), ~~html~~ +- **Supports:** color (background, gradients, link, text), spacing (padding), style, typography (fontSize, lineHeight), ~~html~~ - **Attributes:** textAlign ## Comment Date From 19118617637e428c7a0d8c497360bb8e06d86ec4 Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Sun, 4 Aug 2024 11:09:20 +0530 Subject: [PATCH 04/10] Added style at root level --- packages/block-library/src/comment-content/block.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/block-library/src/comment-content/block.json b/packages/block-library/src/comment-content/block.json index 026b4a6a0d083..0e812299a45e8 100644 --- a/packages/block-library/src/comment-content/block.json +++ b/packages/block-library/src/comment-content/block.json @@ -53,7 +53,7 @@ "padding": true } }, - "html": false, - "style": "wp-block-comment-content" - } + "html": false + }, + "style": "wp-block-comment-content" } From c4d6cbc6ab61d4f71d42c1e18c26ea9fd007882e Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Sun, 4 Aug 2024 11:19:00 +0530 Subject: [PATCH 05/10] fixed lint issue --- docs/reference-guides/core-blocks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index e0be54c451267..5beb712c80a11 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -138,7 +138,7 @@ Displays the contents of a comment. ([Source](https://github.com/WordPress/guten - **Name:** core/comment-content - **Category:** theme - **Ancestor:** core/comment-template -- **Supports:** color (background, gradients, link, text), spacing (padding), style, typography (fontSize, lineHeight), ~~html~~ +- **Supports:** color (background, gradients, link, text), spacing (padding), typography (fontSize, lineHeight), ~~html~~ - **Attributes:** textAlign ## Comment Date From 357b32ab5c22d56c48a86aa77a0a41d0f3fb0c68 Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Fri, 9 Aug 2024 22:45:18 +0530 Subject: [PATCH 06/10] Added Border box in Editor Side --- packages/block-library/src/comment-content/block.json | 1 + packages/block-library/src/comment-content/editor.scss | 3 +++ packages/block-library/src/editor.scss | 1 + 3 files changed, 5 insertions(+) create mode 100644 packages/block-library/src/comment-content/editor.scss diff --git a/packages/block-library/src/comment-content/block.json b/packages/block-library/src/comment-content/block.json index 0e812299a45e8..910960fab64ca 100644 --- a/packages/block-library/src/comment-content/block.json +++ b/packages/block-library/src/comment-content/block.json @@ -55,5 +55,6 @@ }, "html": false }, + "editorStyle": "wp-block-comment-content-editor", "style": "wp-block-comment-content" } diff --git a/packages/block-library/src/comment-content/editor.scss b/packages/block-library/src/comment-content/editor.scss new file mode 100644 index 0000000000000..ee758d72a1bdd --- /dev/null +++ b/packages/block-library/src/comment-content/editor.scss @@ -0,0 +1,3 @@ +.wp-block-comment-content { + box-sizing: border-box; +} diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss index 52f3aa64287fa..330be11c189af 100644 --- a/packages/block-library/src/editor.scss +++ b/packages/block-library/src/editor.scss @@ -11,6 +11,7 @@ @import "./comments-pagination/editor.scss"; @import "./comments-pagination-numbers/editor.scss"; @import "./comments-title/editor.scss"; +@import "./comment-content/editor.scss"; @import "./cover/editor.scss"; @import "./details/editor.scss"; @import "./embed/editor.scss"; From 125b459af8fe96c4cf6d4b0efbbe5e7092532bce Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Fri, 9 Aug 2024 22:50:39 +0530 Subject: [PATCH 07/10] Added suggested changes --- packages/block-library/src/comment-content/editor.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-library/src/comment-content/editor.scss b/packages/block-library/src/comment-content/editor.scss index ee758d72a1bdd..dccec7ab874a8 100644 --- a/packages/block-library/src/comment-content/editor.scss +++ b/packages/block-library/src/comment-content/editor.scss @@ -1,3 +1,4 @@ .wp-block-comment-content { + // This block has customizable padding, border-box makes that more predictable. box-sizing: border-box; } From 77b560a5f9e10fd489a65738534ea3c912716647 Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Mon, 12 Aug 2024 21:46:54 +0530 Subject: [PATCH 08/10] Fixed Conflict Issue --- packages/block-library/src/style.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/block-library/src/style.scss b/packages/block-library/src/style.scss index df1337d7eb25c..86fe5a3eefaba 100644 --- a/packages/block-library/src/style.scss +++ b/packages/block-library/src/style.scss @@ -11,6 +11,7 @@ @import "./comments-pagination/style.scss"; @import "./comment-template/style.scss"; @import "./comment-date/style.scss"; +@import "./comment-content/style.scss"; @import "./cover/style.scss"; @import "./details/style.scss"; @import "./embed/style.scss"; From dbf5900d15f92518ac3f6d6c97ba9319666541eb Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Tue, 13 Aug 2024 21:42:35 +0530 Subject: [PATCH 09/10] Removed Duplicate css --- packages/block-library/src/comment-content/editor.scss | 4 ---- packages/block-library/src/editor.scss | 1 - 2 files changed, 5 deletions(-) delete mode 100644 packages/block-library/src/comment-content/editor.scss diff --git a/packages/block-library/src/comment-content/editor.scss b/packages/block-library/src/comment-content/editor.scss deleted file mode 100644 index dccec7ab874a8..0000000000000 --- a/packages/block-library/src/comment-content/editor.scss +++ /dev/null @@ -1,4 +0,0 @@ -.wp-block-comment-content { - // This block has customizable padding, border-box makes that more predictable. - box-sizing: border-box; -} diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss index 330be11c189af..52f3aa64287fa 100644 --- a/packages/block-library/src/editor.scss +++ b/packages/block-library/src/editor.scss @@ -11,7 +11,6 @@ @import "./comments-pagination/editor.scss"; @import "./comments-pagination-numbers/editor.scss"; @import "./comments-title/editor.scss"; -@import "./comment-content/editor.scss"; @import "./cover/editor.scss"; @import "./details/editor.scss"; @import "./embed/editor.scss"; From 57237e13bb1ff7297f8dffb9fcd01e4274618d7b Mon Sep 17 00:00:00 2001 From: shail-mehta Date: Wed, 14 Aug 2024 21:00:28 +0530 Subject: [PATCH 10/10] remove editor style --- packages/block-library/src/comment-content/block.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/block-library/src/comment-content/block.json b/packages/block-library/src/comment-content/block.json index 910960fab64ca..0e812299a45e8 100644 --- a/packages/block-library/src/comment-content/block.json +++ b/packages/block-library/src/comment-content/block.json @@ -55,6 +55,5 @@ }, "html": false }, - "editorStyle": "wp-block-comment-content-editor", "style": "wp-block-comment-content" }