Commit a82a699c authored by catch's avatar catch
Browse files

task: #3620812 Move toolbar support from Workspaces to Toolbar 

By: catch
By: amateescu
By: gábor hojtsy
By: longwave
parent 9afec8fa

core/modules/navigation/src/NavigationServiceProvider.php

+3 −2
Changes for core/modules/navigation/src/NavigationServiceProvider.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ final class NavigationServiceProvider implements ServiceProviderInterface { 
   * {@inheritdoc}

   */

  public function register(ContainerBuilder $container): void {

    // If Workspaces module service is available, register our own service.

    if ($container->has('workspaces_ui.lazy_builders')) {

    // The workspaces navigation item needs Workspaces UI, so only register

    // its lazy builder when that module is installed.

    if (isset($container->getParameter('container.modules')['workspaces_ui'])) {

      $container

        ->register('navigation.workspaces_lazy_builders', WorkspacesLazyBuilder::class)

        ->addArgument(new Reference('workspaces.manager'));

core/modules/navigation/src/WorkspacesLazyBuilder.php

+1 −1
Changes for core/modules/navigation/src/WorkspacesLazyBuilder.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public function renderNavigationLinks(): array { 
      '#attached' => [

        'library' => [

          'navigation/internal.navigation-workspaces',

          'workspaces/drupal.workspaces_ui.off-canvas',

          'workspaces_ui/drupal.workspaces_ui.off-canvas',

        ],

      ],

      '#cache' => [

core/modules/workspaces_ui/css/workspaces.toolbar.css→core/modules/toolbar/css/toolbar.workspaces_ui.css

+1 −1
Changes for core/modules/toolbar/css/toolbar.workspaces_ui.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


/**

 * @file

 * Styling for Workspaces module's toolbar tab.

 * Styling for the toolbar's workspaces tab.

 */



/* Toolbar tab */

core/modules/workspaces_ui/css/workspaces.toolbar.pcss.css→core/modules/toolbar/css/toolbar.workspaces_ui.pcss.css

+1 −1
Changes for core/modules/toolbar/css/toolbar.workspaces_ui.pcss.css: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
/**

 * @file

 * Styling for Workspaces module's toolbar tab.

 * Styling for the toolbar's workspaces tab.

 */



/* Toolbar tab */