Skip to content

Add custom CSS support to elements and block style variations #49396

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

Closed
carolinan wants to merge 18 commits into from
Closed

Add custom CSS support to elements and block style variations #49396

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d81c2ca
Add custom CSS support for theme.json elements and variations
carolinan Mar 28, 2023
4a92a72
Add a not CSS selector to target the default block variation
carolinan Apr 17, 2023
ba23a86
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan Apr 17, 2023
d76a4d2
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan Apr 17, 2023
1413f49
Update the name of the styles array
carolinan Apr 17, 2023
afb55a2
try a UI for block style variation CSS
carolinan Apr 21, 2023
032b47c
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan Apr 26, 2023
ea2f63a
Try to reduce merge conflicts
carolinan May 8, 2023
c605916
revert context-menu.js
carolinan May 8, 2023
bf7462d
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan May 8, 2023
0204608
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan May 11, 2023
d47fff3
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan May 20, 2023
6ed3e70
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan May 25, 2023
d97bbec
Merge branch 'trunk' into add/elements-variations-custom-css
carolinan May 26, 2023
25db93f
Update class-wp-theme-json-gutenberg.php
carolinan May 26, 2023
720ec7f
Don't include default variation styles added by theme.json
carolinan May 26, 2023
313320a
Update class-wp-theme-json-gutenberg.php
carolinan May 26, 2023
f08f422
Update class-wp-theme-json-gutenberg.php
carolinan May 26, 2023
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
Next Next commit
Update the name of the styles array
  • Loading branch information
@carolinan
carolinan committed Apr 17, 2023
commit 1413f494a9999465a7524d44f9d4f6ffe429ba59
8 changes: 4 additions & 4 deletions packages/block-editor/src/components/global-styles/use-global-styles-output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,11 +1168,11 @@ export function useGlobalStylesOutput() {

// Loop through the elements to check if there are custom CSS values.
// If there are, push the selector together with
// the CSS value to the 'stylesheets' array.
// the CSS value to the 'styles' array.
Object.entries( ELEMENTS ).forEach( ( element ) => {
const [ name, elementsSelector ] = element;
if ( mergedConfig.styles.elements[ name ]?.css ) {
stylesheets.push( {
styles.push( {
css: processCSSNesting(
mergedConfig.styles.elements[ name ]?.css,
elementsSelector
Expand All @@ -1184,7 +1184,7 @@ export function useGlobalStylesOutput() {

// Loop through the blocks to check if there are custom CSS values.
// If there are, get the block selector and push the selector together with
// the CSS value to the 'stylesheets' array.
// the CSS value to the 'styles' array.
getBlockTypes().forEach( ( blockType ) => {
if ( mergedConfig.styles.blocks[ blockType.name ]?.css ) {
const selector = blockSelectors[ blockType.name ].selector;
Expand All @@ -1206,7 +1206,7 @@ export function useGlobalStylesOutput() {
const variationSelector =
blockSelectors[ blockType.name ]
.styleVariationSelectors[ variation[ 0 ] ];
Copy link
Contributor

@tellthemachines tellthemachines May 24, 2023

Choose a reason for hiding this comment

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

We should probably add a version of the "not" selector in here, otherwise styles applied to the default variation won't appear in the editor.

stylesheets.push( {
styles.push( {
css: processCSSNesting(
variation[ 1 ].css,
variationSelector
Expand Down