Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

List block: add color controls #21387

Merged
merged 2 commits into from
Aug 27, 2020
Merged

List block: add color controls #21387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32b50e2
List block: add color controls.
ZebulanStanphill Jun 23, 2020
3a943ea
Workaround for default editor styles overriding padding.
ZebulanStanphill Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/block-library/src/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@import "./latest-comments/editor.scss";
@import "./latest-posts/editor.scss";
@import "./legacy-widget/editor.scss";
@import "./list/editor.scss";
@import "./media-text/editor.scss";
@import "./more/editor.scss";
@import "./navigation/editor.scss";
Expand Down
8 changes: 4 additions & 4 deletions packages/block-library/src/list/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@
"source": "html",
"selector": "ol,ul",
"multiline": "li",
"__unstableMultilineWrapperTags": [
"ol",
"ul"
],
"__unstableMultilineWrapperTags": [ "ol", "ul" ],
"default": ""
},
"type": {
Expand All @@ -30,6 +27,9 @@
"supports": {
"anchor": true,
"className": false,
"__experimentalColor": {
"gradients": true
},
"__unstablePasteTextInline": true,
"lightBlockWrapper": true
}
Expand Down
7 changes: 7 additions & 0 deletions packages/block-library/src/list/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Extra specificity required to override default editor styles, which are
// loaded after core block styles. If the load order changes, this rule can be
// removed. See https://github.com/WordPress/gutenberg/issues/24011.
ol.has-background.has-background,
ul.has-background.has-background {
padding: $block-bg-padding--v $block-bg-padding--h;
}
4 changes: 4 additions & 0 deletions packages/block-library/src/list/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ol.has-background,
ul.has-background {
padding: $block-bg-padding--v $block-bg-padding--h;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This padding is being overridden by the default editor styles. You might want to make the selector .block-editor-block-list__block.has-background instead (that should also work for both types of lists)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

block-editor-block-list__block is a class applied to all blocks in the editor, so I don't think I want to use that selector. (Also, that class is only applied in the editor.)

The default editor style rule (which gets loaded as .editor-styles-wrapper ol, .editor-styles-wrapper ul) has equal specificity as ol.has-background, ul.has-background. The only reason why the default editor styles take precedence is because they are loaded after the block styles. That sounds like a bug to me.

This comment was marked as duplicate.

Sign in to view

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created #24011 to track this bug.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That issue is now fixed. I've created #30094 to remove the now-unnecessary editor styles.

}
1 change: 1 addition & 0 deletions packages/block-library/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
@import "./image/style.scss";
@import "./latest-comments/style.scss";
@import "./latest-posts/style.scss";
@import "./list/style.scss";
@import "./media-text/style.scss";
@import "./navigation/style.scss";
@import "./navigation-link/style.scss";
Expand Down