Skip to content

Notifications: do not rely on admin-bar styles #13690

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
merged 2 commits into from
Oct 9, 2019
Merged

Notifications: do not rely on admin-bar styles #13690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a61f4
Notifications: do not rely on admin-bar styles
jeherve Oct 8, 2019
ed1f3e6
Stop dequeuing style when we need it (when notes is active)
jeherve Oct 8, 2019
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
8 changes: 7 additions & 1 deletion modules/masterbar/masterbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,13 @@ public function admin_body_class( $admin_body_classes ) {
* Remove the default Admin Bar CSS.
*/
public function remove_core_styles() {
wp_dequeue_style( 'admin-bar' );
/*
* Notifications need the admin bar styles,
* so let's not remove them when the module is active.
*/
if ( ! Jetpack::is_module_active( 'notes' ) ) {
wp_dequeue_style( 'admin-bar' );
}
}

/**
Expand Down