diff --git a/css/navigation_extra.css b/css/navigation_extra.css index cd55681dd2f63c8ef25701730e49a999b3a419d2..bb17ada8aea08f4f57aa761a0b74619e74f17b0e 100644 --- a/css/navigation_extra.css +++ b/css/navigation_extra.css @@ -8,8 +8,8 @@ .admin-toolbar__header.navigation-extra--env { color: var(--env-color); - background-color: var(--env-background); border-radius: var(--admin-toolbar-space-8); + background-color: var(--env-background); } .admin-toolbar__header.navigation-extra--env .admin-toolbar__logo svg rect { @@ -20,9 +20,12 @@ fill: var(--env-color); } -.admin-toolbar__header.navigation-extra--env .toolbar-button.toolbar-button--icon--navigation-version, -.admin-toolbar__header.navigation-extra--env .toolbar-button.toolbar-button--icon--navigation-version.current, -.admin-toolbar__header.navigation-extra--env .toolbar-button.toolbar-button--icon--navigation-version.current.is-active { +.admin-toolbar__header.navigation-extra--env + .toolbar-button.toolbar-button--icon--navigation-version, +.admin-toolbar__header.navigation-extra--env + .toolbar-button.toolbar-button--icon--navigation-version.current, +.admin-toolbar__header.navigation-extra--env + .toolbar-button.toolbar-button--icon--navigation-version.current.is-active { color: var(--env-color); background-color: var(--env-background); } diff --git a/js/navigation_extra.js b/js/navigation_extra.js index 9f9ddc218d2addb0f330d5bf1ef33fd1c72475fc..f94afff12cab27eb93fea81357cae1a5fcc125e5 100644 --- a/js/navigation_extra.js +++ b/js/navigation_extra.js @@ -20,11 +20,11 @@ once( 'navigation-extra--version', 'a.admin-toolbar__logo', - context + context, ).forEach((logo) => { const doc = document.documentElement; const version = doc.querySelector( - 'a.toolbar-button--icon--navigation-version' + 'a.toolbar-button--icon--navigation-version', ); const listItem = version.parentElement; @@ -46,14 +46,14 @@ const styleSheet = document.styleSheets[0]; styleSheet.insertRule( 'a.toolbar-button.toolbar-button--icon--navigation-version::before { content: var(--pseudo-before-content); }', - styleSheet.cssRules.length + styleSheet.cssRules.length, ); // Hide the version button if collapsed, otherwise it shrinks // the logo. styleSheet.insertRule( '[data-admin-toolbar="collapsed"] a.toolbar-button.toolbar-button--icon--navigation-version { display: none; }', - styleSheet.cssRules.length + styleSheet.cssRules.length, ); }); } @@ -68,15 +68,16 @@ */ attach: (context) => { if (context === document) { + const environmentBgColor = + drupalSettings.navigation_extra.environment.background; - const environmentBgColor = drupalSettings.navigation_extra.environment.background; - - const environmentColor = drupalSettings.navigation_extra.environment.color; + const environmentColor = + drupalSettings.navigation_extra.environment.color; once( 'navigation-extra--environment', '.admin-toolbar__header', - context + context, ).forEach((header) => { const doc = document.documentElement; @@ -86,7 +87,7 @@ // Disable the menu item icon by removing the ::before style. header.style.setProperty('--env-color', environmentColor); - header.classList.add("navigation-extra--env"); + header.classList.add('navigation-extra--env'); }); } }, diff --git a/src/Form/SettingsForm.php b/src/Form/SettingsForm.php index 48c2498536746abdae78bd497809b11d007efb9b..9bac00e03e01e1d6f4a98856e1e5ed23ed8dfcca 100644 --- a/src/Form/SettingsForm.php +++ b/src/Form/SettingsForm.php @@ -36,7 +36,7 @@ class SettingsForm extends ConfigFormBase { */ public function __construct( ConfigFactoryInterface $configFactory, - protected $typedConfigManager, + protected $typedConfigManager, // @phpstan-ignore-line protected ModuleHandlerInterface $moduleHandler, protected NavigationExtraPluginManagerInterface $pluginManager, protected MenuLinkManagerInterface $menuLinkManager,