Skip to content

Conversation

@getdave
Copy link
Contributor

@getdave getdave commented Dec 1, 2021

Companion fix to WordPress/gutenberg#36960.

In WordPress/gutenberg#36147 we learn that the Theme JSON class automatically applies a margin: 0 to the body element. Unfortunately it does so in a way that means if you use theme.json to define a margin on the body element, the default margin: 0 will still take precedence.

For example applying this to theme.json will still leave you with the default margin: 0 on the body, rather than the expected value of margin: 0 5rem:

{
	"styles": {
		"spacing": {
			"margin": "0 5rem",
			"padding": "0"
		},
	}
}

This PR fixes this by only applying the default margin: 0 if the root spacing does not have a margin declaration.

Trac ticket: https://core.trac.wordpress.org/ticket/54550


This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

@github-actions
Copy link

github-actions bot commented Dec 1, 2021

Hi @getdave! 👋

Thank you for your contribution to WordPress! 💖

It looks like this is your first pull request to wordpress-develop. Here are a few things to be aware of that may help you out!

No one monitors this repository for new pull requests. Pull requests must be attached to a Trac ticket to be considered for inclusion in WordPress Core. To attach a pull request to a Trac ticket, please include the ticket's full URL in your pull request description.

Pull requests are never merged on GitHub. The WordPress codebase continues to be managed through the SVN repository that this GitHub repository mirrors. Please feel free to open pull requests to work on any contribution you are making.

More information about how GitHub pull requests can be used to contribute to WordPress can be found in this blog post.

Please include automated tests. Including tests in your pull request is one way to help your patch be considered faster. To learn about WordPress' test suites, visit the Automated Testing page in the handbook.

If you have not had a chance, please review the Contribute with Code page in the WordPress Core Handbook.

The Developer Hub also documents the various coding standards that are followed:

Thank you,
The WordPress Project

@hellofromtonya
Copy link
Contributor

getdave added a commit to WordPress/gutenberg that referenced this pull request Dec 9, 2021
getdave added a commit to WordPress/gutenberg that referenced this pull request Dec 9, 2021
…es precedence (#36960)

* Set default margin on body prior to generating styles from theme.json

* Add additional context to comment

Addresses #36960 (comment)

* Restore simple version of body rule

Also avoids creating failing unit tests due to a single space character changing in a snaphshot!

* Update with fixes made in Core patch

See WordPress/wordpress-develop#1989

* Fix output now includes new line.

* Fix tests relating to spacing

* Fix test to put body CSS reset first
noisysocks pushed a commit to WordPress/gutenberg that referenced this pull request Dec 13, 2021
…es precedence (#36960)

* Set default margin on body prior to generating styles from theme.json

* Add additional context to comment

Addresses #36960 (comment)

* Restore simple version of body rule

Also avoids creating failing unit tests due to a single space character changing in a snaphshot!

* Update with fixes made in Core patch

See WordPress/wordpress-develop#1989

* Fix output now includes new line.

* Fix tests relating to spacing

* Fix test to put body CSS reset first
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants