Skip to content

Commit

Permalink
Global Styles: Move background panel under color panel (#63888)
Browse files Browse the repository at this point in the history
Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>
Co-authored-by: andrewserong <andrewserong@git.wordpress.org>
Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
  • Loading branch information
4 people authored Jul 24, 2024
1 parent ab9e132 commit 8a36fd4
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions packages/edit-site/src/components/global-styles/screen-block.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,16 @@ function ScreenBlock( { name, variation } ) {
settings={ settings }
/>
) }
{ hasBackgroundPanel && (
<StylesBackgroundPanel
inheritedValue={ inheritedStyle }
value={ style }
onChange={ setStyle }
settings={ settings }
defaultValues={ BACKGROUND_BLOCK_DEFAULT_VALUES }
themeFileURIs={ _links?.[ 'wp:theme-file' ] }
/>
) }
{ hasTypographyPanel && (
<StylesTypographyPanel
inheritedValue={ inheritedStyle }
Expand Down Expand Up @@ -306,17 +316,6 @@ function ScreenBlock( { name, variation } ) {
/>
) }

{ hasBackgroundPanel && (
<StylesBackgroundPanel
inheritedValue={ inheritedStyle }
value={ style }
onChange={ setStyle }
settings={ settings }
defaultValues={ BACKGROUND_BLOCK_DEFAULT_VALUES }
themeFileURIs={ _links?.[ 'wp:theme-file' ] }
/>
) }

{ canEditCSS && (
<PanelBody title={ __( 'Advanced' ) } initialOpen={ false }>
<p>
Expand Down

0 comments on commit 8a36fd4

Please sign in to comment.