Global Styles: Improve organisation of site background color and image #63216
+395
−79
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import BackgroundPanel from './background-panel'; | ||
| import ScreenHeader from './header'; | ||
| import { unlock } from '../../lock-unlock'; | ||
|
|
||
| const { useHasBackgroundPanel, useGlobalSetting } = unlock( | ||
| blockEditorPrivateApis | ||
| ); | ||
|
|
||
| function ScreenBackground() { | ||
| const [ settings ] = useGlobalSetting( '' ); | ||
| const hasBackgroundPanel = useHasBackgroundPanel( settings ); | ||
| return ( | ||
| <> | ||
| <ScreenHeader | ||
| title={ __( 'Background' ) } | ||
| description={ __( | ||
| 'Edit the site background image and color.' | ||
| ) } | ||
| /> | ||
| { hasBackgroundPanel && <BackgroundPanel /> } | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export default ScreenBackground; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,31 +8,20 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor'; | |
| * Internal dependencies | ||
| */ | ||
| import DimensionsPanel from './dimensions-panel'; | ||
| import ScreenHeader from './header'; | ||
| import { unlock } from '../../lock-unlock'; | ||
|
|
||
| const { useHasDimensionsPanel, useGlobalSetting, useSettingsForBlockElement } = | ||
| unlock( blockEditorPrivateApis ); | ||
|
|
||
| function ScreenLayout() { | ||
| const [ rawSettings ] = useGlobalSetting( '' ); | ||
| const settings = useSettingsForBlockElement( rawSettings ); | ||
| const hasDimensionsPanel = useHasDimensionsPanel( settings ); | ||
| return ( | ||
| <> | ||
| <ScreenHeader title={ __( 'Layout' ) } /> | ||
| { hasDimensionsPanel && <DimensionsPanel /> } | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,7 @@ import ScreenStyleVariations from './screen-style-variations'; | |
| import StyleBook from '../style-book'; | ||
| import ScreenCSS from './screen-css'; | ||
| import ScreenRevisions from './screen-revisions'; | ||
| import ScreenBackground from './screen-background'; | ||
| import { unlock } from '../../lock-unlock'; | ||
| import { store as editSiteStore } from '../../store'; | ||
|
|
||
|
|
@@ -371,6 +372,9 @@ function GlobalStylesUI() { | |
| <GlobalStylesNavigationScreen path="/revisions"> | ||
| <ScreenRevisions /> | ||
| </GlobalStylesNavigationScreen> | ||
| <GlobalStylesNavigationScreen path="/background"> | ||
| <ScreenBackground /> | ||
| </GlobalStylesNavigationScreen> | ||
|
|
||
| { blocks.map( ( block ) => ( | ||
| <GlobalStylesNavigationScreen | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ export { default as arrowUp } from './library/arrow-up'; | |
| export { default as atSymbol } from './library/at-symbol'; | ||
| export { default as aspectRatio } from './library/aspect-ratio'; | ||
| export { default as audio } from './library/audio'; | ||
| export { default as background } from './library/background'; | ||
| export { default as backup } from './library/backup'; | ||
| export { default as blockDefault } from './library/block-default'; | ||
| export { default as blockMeta } from './library/block-meta'; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { Path, SVG } from '@wordpress/primitives'; | ||
|
|
||
| const background = ( | ||
| <SVG width="24" height="24" fill="none" xmlns="http://www.w3.org/2000/svg"> | ||
| <Path | ||
| fillRule="evenodd" | ||
| clipRule="evenodd" | ||
| d="M11.53 4.47a.75.75 0 1 0-1.06 1.06l8 8a.75.75 0 1 0 1.06-1.06l-8-8Zm5 1a.75.75 0 1 0-1.06 1.06l2 2a.75.75 0 1 0 1.06-1.06l-2-2Zm-11.06 10a.75.75 0 0 1 1.06 0l2 2a.75.75 0 1 1-1.06 1.06l-2-2a.75.75 0 0 1 0-1.06Zm.06-5a.75.75 0 0 0-1.06 1.06l8 8a.75.75 0 1 0 1.06-1.06l-8-8Zm-.06-3a.75.75 0 0 1 1.06 0l10 10a.75.75 0 1 1-1.06 1.06l-10-10a.75.75 0 0 1 0-1.06Zm3.06-2a.75.75 0 0 0-1.06 1.06l10 10a.75.75 0 1 0 1.06-1.06l-10-10Z" | ||
| /> | ||
| </SVG> | ||
| ); | ||
|
|
||
| export default background; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it was not introduced by this PR, but — as also mentioned about
.components-button—.components-*classnames re not meant to be used outside of the components package. We can use custom classnames instead.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I make the change in this PR only, or a separate PR would be good for it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Happy for it to be a separate, follow-up PR.
The main changes that would be needed:
36pxheight on.components-dropdown. Ideally, we should use the default button height. If not, let's understand why, and at most use therenderToggleprop to pass differently sized button;.components-button, and only use the component props to tweak those aspects (mainly thevariantprop)classNameto the components instances, and then using that custom classname in the styles file;