Skip to content

WIP: Backport per-block global styles custom-CSS #3925

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
aristath wants to merge 19 commits into from
Closed

WIP: Backport per-block global styles custom-CSS #3925

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9d62e05
Add initial backports
glendaviesnz Jan 31, 2023
8693f2d
Add tests for global styles custom CSS
glendaviesnz Feb 1, 2023
cbcae3f
add debugging to unit test
glendaviesnz Feb 1, 2023
b8dd828
check for array or object
glendaviesnz Feb 1, 2023
6ce0630
Remove debugging
glendaviesnz Feb 1, 2023
9525323
Fix permissions issue on multisite test
glendaviesnz Feb 1, 2023
f090f7f
Put permissions assignment in the right place!
glendaviesnz Feb 1, 2023
25e3e9c
Set permissions in tests instead of setup to prevent changing permiss…
glendaviesnz Feb 1, 2023
8bf8b05
Fixes from code review
glendaviesnz Feb 1, 2023
5aff486
But make user definition that was removed by mistake
glendaviesnz Feb 1, 2023
3c7461b
Change ordering of $request[styles] assignment to $config[styles]
glendaviesnz Feb 1, 2023
2026c09
Add initial backports
glendaviesnz Jan 31, 2023
d6a2a7b
Refactor to match new individual custom CSS stylesheet
glendaviesnz Feb 1, 2023
b003ae7
add debugging to unit test
glendaviesnz Feb 1, 2023
369bda5
check for array or object
glendaviesnz Feb 1, 2023
dcfa519
Remove debugging
glendaviesnz Feb 1, 2023
80efb69
Add tests for custom CSS user capabilities
glendaviesnz Feb 1, 2023
6141cc3
Add initial backports from https://github.com/WordPress/gutenberg/pul…
glendaviesnz Jan 23, 2023
ad060f5
backport https://github.com/WordPress/gutenberg/pull/46571
aristath Jan 27, 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
Refactor to match new individual custom CSS stylesheet
  • Loading branch information
@glendaviesnz @aristath
glendaviesnz authored and aristath committed Feb 3, 2023
commit d6a2a7b1a5426f06e49ad34a75cfc73475569b1a
26 changes: 23 additions & 3 deletions src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,9 +1003,29 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
$stylesheet .= $this->get_preset_classes( $setting_nodes, $origins );
}

// Load the custom CSS last so it has the highest specificity.
if ( in_array( 'custom-css', $types, true ) ) {
$stylesheet .= _wp_array_get( $this->theme_json, array( 'styles', 'css' ) );
return $stylesheet;
}

/**
* Returns the global styles custom css.
*
* @since 6.2.0
*
* @return string
*/
public function get_custom_css() {
// Add the global styles root CSS.
$stylesheet = _wp_array_get( $this->theme_json, array( 'styles', 'css' ), '' );

// Add the global styles block CSS.
if ( isset( $this->theme_json['styles']['blocks'] ) ) {
foreach ( $this->theme_json['styles']['blocks'] as $name => $node ) {
$custom_block_css = _wp_array_get( $this->theme_json, array( 'styles', 'blocks', $name, 'css' ) );
if ( $custom_block_css ) {
$selector = static::$blocks_metadata[ $name ]['selector'];
$stylesheet .= $this->process_blocks_custom_css( $custom_block_css, $selector );
}
}
}

return $stylesheet;
Expand Down
3 changes: 1 addition & 2 deletions src/wp-includes/global-styles-and-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ function wp_get_global_styles( $path = array(), $context = array() ) {
*
* @since 5.9.0
* @since 6.1.0 Added 'base-layout-styles' support.
* @since 6.2.0 Support for custom-css type added.
*
* @param array $types Optional. Types of styles to load.
* It accepts as values 'variables', 'presets', 'styles', 'base-layout-styles'.
Expand Down Expand Up @@ -175,7 +174,7 @@ function wp_get_global_stylesheet( $types = array() ) {
if ( empty( $types ) && ! $supports_theme_json ) {
$types = array( 'variables', 'presets', 'base-layout-styles' );
} elseif ( empty( $types ) ) {
$types = array( 'variables', 'styles', 'presets', 'custom-css' );
$types = array( 'variables', 'styles', 'presets' );
}

/*
Expand Down