From 3ccf8445b0ea942cb4968ea194175a1fa78d59df Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 13 May 2021 17:29:13 +0100
Subject: [PATCH] Issue #3208000 by Gauravmahlawat, mherchel: remove
 toolbar.html.twig template as #3174422 is fixed

---
 .../templates/navigation/toolbar.html.twig    | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 core/themes/olivero/templates/navigation/toolbar.html.twig

diff --git a/core/themes/olivero/templates/navigation/toolbar.html.twig b/core/themes/olivero/templates/navigation/toolbar.html.twig
deleted file mode 100644
index 98834789bfb8..000000000000
--- a/core/themes/olivero/templates/navigation/toolbar.html.twig
+++ /dev/null
@@ -1,51 +0,0 @@
-{#
-/**
- * @file
- * Theme override for the administrative toolbar.
- *
- * @todo Remove this template when https://www.drupal.org/project/drupal/issues/3174422
- * is committed.
- *
- * 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 key, tab in tabs %}
-      {% set tray = trays[key] %}
-      <div{{ tab.attributes.addClass('toolbar-tab') }}>
-        {{ tab.link }}
-        {% apply 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>
-        {% endapply %}
-      </div>
-    {% endfor %}
-  </nav>
-  {{ remainder }}
-</div>
-- 
GitLab