Skip to content
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

Global Styles: enqueue styles later so theme css can load first #34147

Closed
wants to merge 1 commit into from
Closed

Global Styles: enqueue styles later so theme css can load first #34147

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
17 changes: 11 additions & 6 deletions lib/global-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@ function gutenberg_experimental_global_styles_enqueue_assets() {
return;
}

// Dequeue and deregister global styles, if needed, to enqueue with a later priority.
// This lets theme styles load before on the default priority, so global styles
// user settings take prededence over theme settings and css.
if ( isset( wp_styles()->registered['global-styles'] ) ) {
wp_styles()->registered['global-styles']->extra['after'][0] = $stylesheet;
} else {
wp_register_style( 'global-styles', false, array(), true, true );
wp_add_inline_style( 'global-styles', $stylesheet );
wp_enqueue_style( 'global-styles' );
wp_dequeue_style( 'global-styles' );
wp_deregister_style( 'global-styles' );
}

wp_register_style( 'global-styles', false, array(), true, true );
wp_add_inline_style( 'global-styles', $stylesheet );
wp_enqueue_style( 'global-styles' );
}

/**
Expand Down Expand Up @@ -334,7 +338,8 @@ function gutenberg_global_styles_include_support_for_wp_variables( $allow_css, $
}

add_action( 'init', 'gutenberg_experimental_global_styles_register_user_cpt' );
add_action( 'wp_enqueue_scripts', 'gutenberg_experimental_global_styles_enqueue_assets' );
// Enqueue on a later priority so theme styles on the default priority are enqueued first.
add_action( 'wp_enqueue_scripts', 'gutenberg_experimental_global_styles_enqueue_assets', 50 );

// kses actions&filters.
add_action( 'init', 'gutenberg_global_styles_kses_init' );
Expand Down