Skip to content

Output custom CSS as separate styles in block themes #9334

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
t-hamano wants to merge 1 commit into from
Closed

Output custom CSS as separate styles in block themes #9334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/js/_enqueues/wp/customize/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@
* @return {void}
*/
custom_css: function( value ) {
$( '#wp-custom-css' ).text( value );
$( '#wp-custom-css-inline-css' ).text( value );
},

/**
Expand Down
32 changes: 18 additions & 14 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2535,20 +2535,6 @@ function wp_enqueue_global_styles() {

$stylesheet = wp_get_global_stylesheet();

if ( $is_block_theme ) {
/*
* Dequeue the Customizer's custom CSS
* and add it before the global styles custom CSS.
*/
remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
// Get the custom CSS from the Customizer and add it to the global stylesheet.
$custom_css = wp_get_custom_css();
$stylesheet .= $custom_css;

// Add the global styles custom CSS at the end.
$stylesheet .= wp_get_global_stylesheet( array( 'custom-css' ) );
}

if ( empty( $stylesheet ) ) {
return;
}
Expand All @@ -2557,6 +2543,24 @@ function wp_enqueue_global_styles() {
wp_add_inline_style( 'global-styles', $stylesheet );
wp_enqueue_style( 'global-styles' );

if ( $is_block_theme ) {
/*
* Dequeue the Customizer's custom CSS
* and add it before the global styles custom CSS.
*/
remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
$customizer_custom_css = wp_get_custom_css();
wp_register_style( 'wp-custom-css', false );
wp_add_inline_style( 'wp-custom-css', $customizer_custom_css );
wp_enqueue_style( 'wp-custom-css' );

// Enqueue the global styles custom CSS.
$global_styles_custom_css = wp_get_global_stylesheet( array( 'custom-css' ) );
wp_register_style( 'global-styles-custom-css', false );
wp_add_inline_style( 'global-styles-custom-css', $global_styles_custom_css );
wp_enqueue_style( 'global-styles-custom-css' );
}

// Add each block as an inline css.
wp_add_global_styles_for_blocks();
}
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/theme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ function wp_custom_css_cb() {
if ( $styles || is_customize_preview() ) :
$type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
?>
<style<?php echo $type_attr; ?> id="wp-custom-css">
<style<?php echo $type_attr; ?> id="wp-custom-css-inline-css">
<?php
// Note that esc_html() cannot be used because `div &gt; span` is not interpreted properly.
echo strip_tags( $styles );
Expand Down
Loading