Issue #2349767 by mortendk, kallehauge, saki007ster, lauriii: Copy toolbar templates to Classy

core/modules/toolbar/templates/toolbar.html.twig

@@ -23,7 +23,7 @@
  */
 #}
 <div{{ attributes.addClass('toolbar') }}>
-  <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+  <nav{{ toolbar_attributes.addClass('toolbar-bar') }}>
     <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
     {% for tab in tabs %}
       <div{{ tab.attributes.addClass('toolbar-tab') }}>{{ tab.link }}</div>
@@ -33,10 +33,10 @@
     {% spaceless %}
     <div{{ tray.attributes }}>
     {% if tray.label %}
-      <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+      <nav class="toolbar-lining" role="navigation" aria-label="{{ tray.label }}">
           <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
     {% else %}
-      <nav class="toolbar-lining clearfix" role="navigation">
+      <nav class="toolbar-lining" role="navigation">
     {% endif %}
         {{ tray.links }}
       </nav>

core/themes/classy/templates/toolbar.html.twig

+{#
+/**
+ * @file
+ * Default theme implementation for the administrative toolbar.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the wrapper.
+ * - toolbar_attributes: HTML attributes to apply to the toolbar.
+ * - toolbar_heading: The heading or label for the toolbar.
+ * - tabs: List of tabs for the toolbar.
+ *   - attributes: HTML attributes for the tab container.
+ *   - link: Link or button for the menu tab.
+ * - trays: Toolbar tray list, each associated with a tab. Each tray in trays
+ *   contains:
+ *   - attributes: HTML attributes to apply to the tray.
+ *   - label: The tray's label.
+ *   - links: The tray menu links.
+ * - remainder: Any non-tray, non-tab elements left to be rendered.
+ *
+ * @see template_preprocess_toolbar()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('toolbar') }}>
+  <nav{{ toolbar_attributes.addClass('toolbar-bar', 'clearfix') }}>
+    <h2 class="visually-hidden">{{ toolbar_heading }}</h2>
+    {% for tab in tabs %}
+      <div{{ tab.attributes.addClass('toolbar-tab') }}>{{ tab.link }}</div>
+    {% endfor %}
+  </nav>
+  {% for tray in trays %}
+    {% spaceless %}
+    <div{{ tray.attributes }}>
+    {% if tray.label %}
+      <nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
+          <h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
+    {% else %}
+      <nav class="toolbar-lining clearfix" role="navigation">
+    {% endif %}
+        {{ tray.links }}
+      </nav>
+    </div>
+    {% endspaceless %}
+  {% endfor %}
+  {{ remainder }}
+</div>