diff --git a/plugins/woocommerce-admin/client/navigation/stylesheets/index.scss b/plugins/woocommerce-admin/client/navigation/stylesheets/index.scss index ad32ea5339a..8725644af3b 100644 --- a/plugins/woocommerce-admin/client/navigation/stylesheets/index.scss +++ b/plugins/woocommerce-admin/client/navigation/stylesheets/index.scss @@ -31,11 +31,6 @@ } } - #adminmenu - li.toplevel_page_woocommerce.wp-has-submenu.wp-not-current-submenu.opensub:hover::after { - display: none; - } - #woocommerce-embedded-navigation { position: fixed; top: 0; @@ -46,14 +41,4 @@ // @todo This should be updated to G2.darkGray.primary when possible. background-color: #1e1e1e; } - - body.is-folded #woocommerce-embedded-navigation { - height: 60px; - width: 60px; - overflow: hidden; - } - - .toplevel_page_woocommerce ul.wp-submenu { - display: none; - } } diff --git a/plugins/woocommerce-admin/packages/navigation/src/style.scss b/plugins/woocommerce-admin/packages/navigation/src/style.scss new file mode 100644 index 00000000000..6dd45e8c7ac --- /dev/null +++ b/plugins/woocommerce-admin/packages/navigation/src/style.scss @@ -0,0 +1,11 @@ +// Hide elements on non-WooCommerce pages. +body.js:not(.has-woocommerce-navigation) { + #adminmenu + li.toplevel_page_woocommerce.wp-has-submenu.wp-not-current-submenu.opensub:hover::after { + display: none; + } + + .toplevel_page_woocommerce ul.wp-submenu { + display: none; + } +} diff --git a/plugins/woocommerce-admin/src/Features/Navigation/Navigation.php b/plugins/woocommerce-admin/src/Features/Navigation/Navigation.php index 655ccb0eb31..3938dae0246 100644 --- a/plugins/woocommerce-admin/src/Features/Navigation/Navigation.php +++ b/plugins/woocommerce-admin/src/Features/Navigation/Navigation.php @@ -25,6 +25,7 @@ class Navigation { if ( Loader::is_feature_enabled( 'navigation' ) ) { add_action( 'in_admin_header', array( __CLASS__, 'embed_navigation' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'maybe_enqueue_scripts' ) ); Menu::instance()->init(); CoreMenu::instance()->init(); @@ -69,4 +70,22 @@ class Navigation {