Skip to content

Move custom css to its own inline style generation method and combine with customizer CSS #47396

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
glendaviesnz merged 7 commits into from
Jan 31, 2023
Merged

Move custom css to its own inline style generation method and combine with customizer CSS #47396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c7787b0
Move custom css to its on inline style at bottom of header
glendaviesnz Jan 25, 2023
c2ecf73
Fix linting issues
glendaviesnz Jan 25, 2023
d8debd6
Also move block custom CSS to separate stylesheet
glendaviesnz Jan 25, 2023
f0597dc
Update test
glendaviesnz Jan 25, 2023
f67ba8c
Switch from `wp_enqueue_style` to just outputting the style tags in o…
glendaviesnz Jan 25, 2023
317c39e
Move to 6.2 script-loader compat file
glendaviesnz Jan 26, 2023
3b44904
Global Styles: Alternative method for enqueueing custom CSS (#47554)
Mamaduka Jan 31, 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
Move to 6.2 script-loader compat file
  • Loading branch information
@glendaviesnz
glendaviesnz committed Jan 26, 2023
commit 317c39edf686d4592905c54fac601ff8592d1b38
18 changes: 0 additions & 18 deletions lib/compat/wordpress-6.1/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,6 @@ function gutenberg_enqueue_global_styles() {
gutenberg_add_global_styles_for_blocks();
}

/**
* Enqueues the global styles custom css.
*
* @since 6.2.0
*/
function gutenberg_enqueue_global_styles_custom_css() {
$custom_css = get_global_styles_custom_css();
$is_block_theme = wp_is_block_theme();
if ( $custom_css && $is_block_theme ) {
?>
<style id="global-styles-custom-css-inline-css" type="text/css">
<?php echo $custom_css; ?>
</style>
<?php
}
}

remove_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
remove_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
remove_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_global_styles_assets' );
Expand All @@ -98,7 +81,6 @@ function gutenberg_enqueue_global_styles_custom_css() {
// Enqueue global styles, and then block supports styles.
add_action( 'wp_enqueue_scripts', 'gutenberg_enqueue_global_styles' );
add_action( 'wp_footer', 'gutenberg_enqueue_global_styles', 1 );
add_action( 'wp_head', 'gutenberg_enqueue_global_styles_custom_css', 102 );

/**
* Loads classic theme styles on classic themes in the frontend.
Expand Down
19 changes: 19 additions & 0 deletions lib/compat/wordpress-6.2/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,22 @@ function( $settings ) {
},
100
);

/**
* Enqueues the global styles custom css.
*
* @since 6.2.0
*/
function gutenberg_enqueue_global_styles_custom_css() {
$custom_css = get_global_styles_custom_css();
$is_block_theme = wp_is_block_theme();
if ( $custom_css && $is_block_theme ) {
?>
<style id="global-styles-custom-css-inline-css" type="text/css">
<?php echo $custom_css; ?>
</style>
<?php
}
}

add_action( 'wp_head', 'gutenberg_enqueue_global_styles_custom_css', 102 );