. #}
+ {% if configuration.label_display %}
+
+ {% endif %}
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+ {% if configuration.label_display %}
+
+ {% endif %}
+
diff --git a/core/modules/system/templates/menu-tree.html.twig b/core/modules/system/templates/menu-tree.html.twig
index 03acca6..82a3d01 100644
--- a/core/modules/system/templates/menu-tree.html.twig
+++ b/core/modules/system/templates/menu-tree.html.twig
@@ -6,20 +6,6 @@
* Available variables:
* - attributes: Attributes for the UL containing the tree of links.
* - tree: Menu tree to be output.
- * - heading: (optional) A heading to precede the links.
- * - text: The heading text.
- * - level: The heading level (e.g. 'h2', 'h3').
- * - attributes: (optional) A keyed list of attributes for the heading.
- * If the heading is a string, it will be used as the text of the heading and
- * the level will default to 'h2'.
- *
- * Headings should be used on navigation menus and any list of links that
- * consistently appears on multiple pages. To make the heading invisible use
- * the 'visually-hidden' CSS class. Do not use 'display:none', which
- * removes it from screen-readers and assistive technology. Headings allow
- * screen-reader and keyboard only users to navigate to or skip the links.
- * See http://juicystudio.com/article/screen-readers-display-none.php and
- * http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
*
* @see template_preprocess_menu_tree()
*
@@ -27,14 +13,7 @@
*/
#}
{% if tree -%}
- {%- if heading -%}
- {%- if heading.level -%}
- <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }}{{ heading.level }}>
- {%- else -%}
-
{{ heading.text }}
- {%- endif -%}
- {%- endif -%}
-
+
{%- endif %}
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index ba013a2..41d8270 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -26,9 +26,6 @@
* slogan has been disabled in theme settings.
*
* Navigation:
- * - main_menu: The Main menu links for the site, if they have been configured.
- * - secondary_menu: The Secondary menu links for the site, if they have been
- * configured.
* - breadcrumb: The breadcrumb trail for the current page.
*
* Page content (in order of occurrence in the default page.html.twig):
@@ -50,6 +47,8 @@
*
* Regions:
* - page.header: Items for the header region.
+ * - page.primary_menu: Items for the primary menu region.
+ * - page.secondary_menu: Items for the secondary menu region.
* - page.highlighted: Items for the highlighted content region.
* - page.help: Dynamic help text, mostly for admin pages.
* - page.content: The main content of the current page.
@@ -90,17 +89,13 @@
{{ site_slogan }}
{% endif %}
{# ./name-and-slogan #}
- {% endif %}
+ {% endif %}
{{ page.header }}
- {% if main_menu or secondary_menu %}
-