Skip to content

Global Styles: refactor site background controls and move site global styles into Background group #65304

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

Merged
ramonjd merged 6 commits into from
Sep 16, 2024
Merged

Global Styles: refactor site background controls and move site global styles into Background group #65304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1d4e24
initial commit - moving controls for background image into dedicated …
ramonjd Sep 12, 2024
d6dd1c9
Moving exported hooks to background-panel
ramonjd Sep 13, 2024
8d0111a
Whoops - wrong import path
ramonjd Sep 13, 2024
852d42c
TAAAAAAAAAAABSSS
ramonjd Sep 13, 2024
5eae04c
Forgot to move the tests!
ramonjd Sep 13, 2024
9996094
Change order of style navigation items. Background is now underneath …
ramonjd Sep 16, 2024
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
Prev Previous commit
Change order of style navigation items. Background is now underneath … 
…color.

Shorten copy and wrap in Text to avoid widows.
  • Loading branch information
@ramonjd
ramonjd committed Sep 16, 2024
commit 99960940fac2d1284ad3986af4c18b12861df4b3
18 changes: 9 additions & 9 deletions packages/edit-site/src/components/global-styles/root-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@ function RootMenu() {
return (
<>
<ItemGroup>
{ hasBackgroundPanel && (
<NavigationButtonAsItem
icon={ background }
path="/background"
aria-label={ __( 'Background styles' ) }
>
{ __( 'Background' ) }
</NavigationButtonAsItem>
) }
{ hasTypographyPanel && (
<NavigationButtonAsItem
icon={ typography }
Expand All @@ -71,6 +62,15 @@ function RootMenu() {
{ __( 'Colors' ) }
</NavigationButtonAsItem>
) }
{ hasBackgroundPanel && (
<NavigationButtonAsItem
icon={ background }
path="/background"
aria-label={ __( 'Background styles' ) }
>
{ __( 'Background' ) }
</NavigationButtonAsItem>
) }
{ hasShadowPanel && (
<NavigationButtonAsItem
icon={ shadowIcon }
Expand Down
9 changes: 6 additions & 3 deletions packages/edit-site/src/components/global-styles/screen-background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
import { __ } from '@wordpress/i18n';
import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import { __experimentalText as Text } from '@wordpress/components';

/**
* Internal dependencies
Expand All @@ -22,9 +23,11 @@ function ScreenBackground() {
<>
<ScreenHeader
title={ __( 'Background' ) }
description={ __(
'Edit styles that apply to the site’s background.'
) }
description={
<Text>
{ __( 'Set styles for the site’s background.' ) }
</Text>
}
/>
{ hasBackgroundPanel && <BackgroundPanel /> }
</>
Expand Down