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

Columns: Add padding support #35701

Merged
merged 3 commits into from
Nov 4, 2021
Merged

Columns: Add padding support #35701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d18920
Opt into padding support for columns block
stacimc Oct 15, 2021
cf424b3
Lower specificity of selector for padding set with background color
stacimc Oct 18, 2021
d894df4
Move styles back to style.scss
stacimc Oct 20, 2021
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/columns/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"spacing": {
"blockGap": true,
"margin": [ "top", "bottom" ],
"padding": true,
"__experimentalDefaultControls": {
"blockGap": true
}
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/columns/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
flex-wrap: nowrap;
}

&.has-background {
&:where(.has-background) {
Copy link
Member

Choose a reason for hiding this comment

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

Just checking something. When I set padding in my theme.json via styles

	"styles": {
		"spacing": {
			"padding": "55px",
			"blockGap": "66px"

		},
 ...

These styles override the body styles of padding: 55px. Block spacing works as expected.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good callout. This is correct as I understand it -- these styles will override top-level (body) styles from theme.json, but not theme.json styles for the Columns block specifically, or of course values from global styles/the block controls. I confirmed this is how the Group block behaves as well.

padding: $block-bg-padding--v $block-bg-padding--h;
}

Expand Down