Merge branch '3415330-always-display-top' into '1.x'

Always display top (control) bar

See merge request !166

css/components/top-bar.css

@@ -36,8 +36,14 @@
     box-shadow: 0 0 40px 0 var(--admin-toolbar-color-shadow-6), 0 4px 4px 0 var(--admin-toolbar-color-shadow-8);
   }
 }
+/* When only one burger button hide top bar on desktop. */
 @media (min-width: 64rem) {
-  .top-bar ~ .dialog-off-canvas-main-canvas {
+  .top-bar:has(.top-bar__burger:only-child) {
+    display: none;
+  }
+}
+@media (min-width: 64rem) {
+  .top-bar:not(:has(.top-bar__burger:only-child)) ~ .dialog-off-canvas-main-canvas {
     margin-block-start: var(--admin-toolbar-top-bar-height);
   }
 }

css/components/top-bar.pcss.css

@@ -34,7 +34,14 @@
   }
 }
 
-.top-bar ~ .dialog-off-canvas-main-canvas {
+/* When only one burger button hide top bar on desktop. */
+.top-bar:has(.top-bar__burger:only-child) {
+  @media (--admin-toolbar-desktop) {
+    display: none;
+  }
+}
+
+.top-bar:not(:has(.top-bar__burger:only-child)) ~ .dialog-off-canvas-main-canvas {
   @media (--admin-toolbar-desktop) {
     margin-block-start: var(--admin-toolbar-top-bar-height);
   }

src/NavigationRenderer.php

@@ -121,9 +121,26 @@ class NavigationRenderer {
    */
   public function buildTopBar(array &$page_top): void {
     $navigation_settings = $this->configFactory->get('navigation.settings');
+    $page_top['top_bar'] = [
+      '#theme' => 'top_bar',
+      '#attached' => [
+        'library' => [
+          'navigation/navigation',
+        ],
+      ],
+      '#cache' => [
+        'contexts' => [
+          'url.path',
+          'user',
+        ],
+      ],
+      '#access' => $this->currentUser->hasPermission('access navigation'),
+    ];
+
     if ($navigation_settings->get('hide_top_bar') === TRUE) {
       return;
     }
+
     // Local tasks for content entities.
     if ($this->hasLocalTasks()) {
       $local_tasks = $this->getLocalTasks();

templates/navigation.html.twig

-{# Temporary bar for mobile. https://www.drupal.org/project/navigation/issues/3402046#comment-15402086 #}
-<div class="temp-bar" style="padding: 20px">
-  <style>
-    @media (min-width: 64rem) {
-      .temp-bar {
-        padding: 20px;
-        display: none;
-      }
-    }
-  </style>
-  <button aria-controls="admin-toolbar">{{ 'Expand sidebar'|t }}</button>
-</div>
-
 <aside class="admin-toolbar" id="admin-toolbar">
   {# This lil' div will get the Drupal.displace() attributes added to it via JS. #}
   <div class="admin-toolbar__displace-placeholder"></div>