. #}
+ {% 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..430f860 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):
@@ -95,12 +92,14 @@
{{ page.header }}
+{# @todo Figure out how to replace this.
{% if main_menu or secondary_menu %}
{% endif %}
+#}
{{ breadcrumb }}
diff --git a/core/modules/user/src/Tests/UserAccountLinksTests.php b/core/modules/user/src/Tests/UserAccountLinksTests.php
index 4ad246b..97fa8a3 100644
--- a/core/modules/user/src/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/src/Tests/UserAccountLinksTests.php
@@ -24,8 +24,12 @@ class UserAccountLinksTests extends WebTestBase {
*/
public static $modules = array('menu_ui', 'block', 'test_page_test');
+ /**
+ * {@inheritdoc}
+ */
protected function setUp() {
parent::setUp();
+ $this->drupalPlaceBlock('system_menu_block:account');
// Make test-page default.
\Drupal::config('system.site')->set('page.front', 'test-page')->save();
}
diff --git a/core/modules/user/src/Tests/UserPasswordResetTest.php b/core/modules/user/src/Tests/UserPasswordResetTest.php
index 0ea06c0..2e61de5 100644
--- a/core/modules/user/src/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/src/Tests/UserPasswordResetTest.php
@@ -22,9 +22,21 @@ class UserPasswordResetTest extends WebTestBase {
*/
protected $account;
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = ['block'];
+
+ /**
+ * {@inheritdoc}
+ */
protected function setUp() {
parent::setUp();
+ $this->drupalPlaceBlock('system_menu_block:account');
+
// Create a user.
$account = $this->drupalCreateUser();
diff --git a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
index 3750601..d975a80 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayPageWebTest.php
@@ -108,7 +108,7 @@ public function testPageDisplayMenu() {
$this->drupalPlaceBlock('system_menu_block:tools');
$this->drupalGet('');
- $menu_link = $this->cssSelect('div.block-menu ul.menu a');
+ $menu_link = $this->cssSelect('nav.block-menu ul.menu a');
$this->assertEqual((string) $menu_link[0], 'Test menu link');
// Update the menu link.
@@ -117,7 +117,7 @@ public function testPageDisplayMenu() {
], t('Save'));
$this->drupalGet('');
- $menu_link = $this->cssSelect('div.block-menu ul.menu a');
+ $menu_link = $this->cssSelect('nav.block-menu ul.menu a');
$this->assertEqual((string) $menu_link[0], 'New title');
}
diff --git a/core/modules/views/src/Tests/Wizard/MenuTest.php b/core/modules/views/src/Tests/Wizard/MenuTest.php
index 505b4ce..ba3aa42 100644
--- a/core/modules/views/src/Tests/Wizard/MenuTest.php
+++ b/core/modules/views/src/Tests/Wizard/MenuTest.php
@@ -20,6 +20,8 @@ class MenuTest extends WizardTestBase {
* Tests the menu functionality.
*/
function testMenus() {
+ $this->drupalPlaceBlock('system_menu_block:main');
+
// Create a view with a page display and a menu link in the Main Menu.
$view = array();
$view['label'] = $this->randomMachineName(16);
diff --git a/core/profiles/standard/config/install/block.block.bartik_mainnavigation_level1.yml b/core/profiles/standard/config/install/block.block.bartik_mainnavigation_level1.yml
new file mode 100644
index 0000000..eb4b1dc
--- /dev/null
+++ b/core/profiles/standard/config/install/block.block.bartik_mainnavigation_level1.yml
@@ -0,0 +1,25 @@
+id: bartik_mainnavigation_level1
+theme: bartik
+weight: 0
+status: true
+langcode: en
+region: header
+plugin: 'system_menu_block:main'
+settings:
+ visibility: {}
+ id: 'system_menu_block:main'
+ label: 'Main navigation'
+ provider: system
+ label_display: '0'
+ cache:
+ max_age: -1
+ contexts: { }
+ level: 1
+ depth: 1
+dependencies:
+ entity:
+ - system.menu.main
+ module:
+ - system
+ theme:
+ - bartik
diff --git a/core/profiles/standard/config/install/block.block.bartik_useraccountmenu_level1.yml b/core/profiles/standard/config/install/block.block.bartik_useraccountmenu_level1.yml
new file mode 100644
index 0000000..3c91b29
--- /dev/null
+++ b/core/profiles/standard/config/install/block.block.bartik_useraccountmenu_level1.yml
@@ -0,0 +1,25 @@
+id: bartik_useraccountmenu_level1
+theme: bartik
+weight: 0
+status: true
+langcode: en
+region: header
+plugin: 'system_menu_block:account'
+settings:
+ visibility: { }
+ id: 'system_menu_block:account'
+ label: 'User account menu (level 1)'
+ provider: system
+ label_display: '0'
+ cache:
+ max_age: -1
+ contexts: { }
+ level: 1
+ depth: 1
+dependencies:
+ entity:
+ - system.menu.account
+ module:
+ - system
+ theme:
+ - bartik
diff --git a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
index cbd81f5..2d3fa4c 100644
--- a/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
+++ b/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
@@ -227,65 +227,6 @@ public function testFlatten() {
}
/**
- * Tests the extractSubtreeOfActiveTrail() tree manipulator.
- *
- * @covers ::extractSubtreeOfActiveTrail
- */
- public function testExtractSubtreeOfActiveTrail() {
- // No link in the active trail.
- $this->mockTree();
- // Get level 0.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 0);
- $this->assertEquals(array(1, 2, 5, 6, 8), array_keys($tree));
- // Get level 1.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 1);
- $this->assertEquals(array(), array_keys($tree));
- // Get level 2.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 1);
- $this->assertEquals(array(), array_keys($tree));
-
- // Link 5 in the active trail.
- $this->mockTree();
- $this->originalTree[5]->inActiveTrail = TRUE;
- // Get level 0.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 0);
- $this->assertEquals(array(1, 2, 5, 6, 8), array_keys($tree));
- // Get level 1.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 1);
- $this->assertEquals(array(7), array_keys($tree));
- // Get level 2.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 2);
- $this->assertEquals(array(), array_keys($tree));
-
- // Link 2 in the active trail.
- $this->mockTree();
- $this->originalTree[2]->inActiveTrail = TRUE;
- // Get level 0.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 0);
- $this->assertEquals(array(1, 2, 5, 6, 8), array_keys($tree));
- // Get level 1.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 1);
- $this->assertEquals(array(3), array_keys($tree));
- // Get level 2.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 2);
- $this->assertEquals(array(), array_keys($tree));
-
- // Links 2 and 3 in the active trail.
- $this->mockTree();
- $this->originalTree[2]->inActiveTrail = TRUE;
- $this->originalTree[2]->subtree[3]->inActiveTrail = TRUE;
- // Get level 0.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 0);
- $this->assertEquals(array(1, 2, 5, 6, 8), array_keys($tree));
- // Get level 1.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 1);
- $this->assertEquals(array(3), array_keys($tree));
- // Get level 2.
- $tree = $this->defaultMenuTreeManipulators->extractSubtreeOfActiveTrail($this->originalTree, 2);
- $this->assertEquals(array(4), array_keys($tree));
- }
-
- /**
* Tests the optimized node access checking.
*
* @covers ::checkNodeAccess
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 27f8973..c402cf9 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -55,17 +55,6 @@ function bartik_preprocess_page(&$variables) {
// Store back the classes to the htmlpage object.
$attributes['class'] = $classes;
- // Set additional attributes on the primary and secondary navigation menus.
- if (!empty($variables['main_menu'])) {
- $variables['main_menu']['#attributes']['id'] = 'main-menu-links';
- $variables['main_menu']['#attributes']['class'][] = 'links';
- }
- if (!empty($variables['secondary_menu'])) {
- $variables['secondary_menu']['#attributes']['id'] = 'secondary-menu-links';
- $variables['secondary_menu']['#attributes']['class'][] = 'links';
- $variables['secondary_menu']['#attributes']['class'][] = 'inline';
- }
-
// Set the options that apply to both page and maintenance page.
_bartik_process_page($variables);
diff --git a/core/themes/bartik/css/colors.css b/core/themes/bartik/css/colors.css
index b52e01e..92f604f 100644
--- a/core/themes/bartik/css/colors.css
+++ b/core/themes/bartik/css/colors.css
@@ -8,8 +8,8 @@ body {
}
#page,
#main-wrapper,
-#main-menu-links li a.active,
-#main-menu-links li.active-trail a {
+#header .block-menu:first-child .menu li a.active,
+#header .block-menu:first-child .menu li.active-trail a {
background: #ffffff;
}
.tabs ul.primary li a.active {
diff --git a/core/themes/bartik/css/layout.css b/core/themes/bartik/css/layout.css
index 7374a10..68826b0 100644
--- a/core/themes/bartik/css/layout.css
+++ b/core/themes/bartik/css/layout.css
@@ -24,14 +24,6 @@ body,
#header div.section {
position: relative;
}
-.region-header {
- float: right; /* LTR */
- margin: .5em 5px .75em;
- border: 1px solid #ccc;
-}
-[dir="rtl"] .region-header {
- float: left;
-}
#secondary-menu {
width: 100%;
margin: 0 auto;
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 6470a33..9a7ad23 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -420,6 +420,12 @@ h1.site-name {
list-style-image: none;
padding: 0;
}
+/* Treat menu blocks in the region header as a special case. */
+.region-header .block-menu {
+ float: none;
+ margin: 0;
+ font-size: inherit;
+}
.region-header .form-text {
background: #fefefe;
background: rgba(255, 255, 255, 0.7);
@@ -441,30 +447,6 @@ h1.site-name {
.region-header .form-required:after {
background-image: url(../images/required.svg);
}
-/* Region header block menus. */
-.region-header .block-menu {
- border: 1px solid;
- border-color: #eee;
- border-color: rgba(255, 255, 255, 0.2);
- padding: 0;
- width: 208px;
-}
-.region-header .block-menu li a {
- display: block;
- border-bottom: 1px solid;
- border-bottom-color: #eee;
- border-bottom-color: rgba(255, 255, 255, 0.2);
- padding: 3px 7px;
-}
-.region-header .block-menu li a:hover,
-.region-header .block-menu li a:active,
-.region-header .block-menu li a:focus {
- text-decoration: none;
- background: rgba(255, 255, 255, 0.15);
-}
-.region-header .block-menu li:last-child a {
- border-bottom: 0;
-}
/* User Login block in the header region */
.region-header #block-user-login {
width: auto;
@@ -547,19 +529,19 @@ h1.site-name {
}
/* --------------- Main Menu ------------ */
-#main-menu {
+#header .block-menu:first-child {
clear: both;
}
-#main-menu-links {
+#header .block-menu:first-child .menu {
font-size: 0.929em;
margin: 0 5px;
padding: 0;
text-align: left; /* LTR */
}
-[dir="rtl"] #main-menu-links {
+[dir="rtl"] #header .block-menu:first-child .menu {
text-align: right;
}
-#main-menu-links li {
+#header .block-menu:first-child .menu li {
float: none;
list-style: none;
margin: 0;
@@ -567,7 +549,7 @@ h1.site-name {
height: auto;
width: 100%;
}
-#main-menu-links a {
+#header .block-menu:first-child .menu a {
color: #333;
background: #ccc;
background: rgba(255, 255, 255, 0.7);
@@ -579,31 +561,38 @@ h1.site-name {
margin: 4px 0;
padding: 0.9em 0 0.9em 10px; /* LTR */
}
-[dir="rtl"] #main-menu-links a {
+[dir="rtl"] #header .block-menu:first-child .menu a {
padding: 0.9em 10px 0.9em 0;
}
-#main-menu-links a:hover,
-#main-menu-links a:focus {
+#header .block-menu:first-child .menu a:hover,
+#header .block-menu:first-child .menu a:focus {
background: #f6f6f2;
background: rgba(255, 255, 255, 0.95);
}
-#main-menu-links a:active {
+#header .block-menu:first-child .menu a:active {
background: #b3b3b3;
background: rgba(255, 255, 255, 1);
}
-#main-menu-links li a.active {
+#header .block-menu:first-child .menu li a.active {
border-bottom: none;
}
/* ---------- Main Menu Toggle ----------- */
-#nav, #no-nav {
+/* Hide the toggle by default. */
+#header .block-menu .menu-toggle,
+#header .block-menu .menu-toggle-target {
+ display: none;
+}
+/* Unhide it for the main menu. */
+#header .block-menu:first-child .menu-toggle-target {
+ display: inherit;
position: fixed;
top: 0;
}
-.main-menu-reveal {
+#header .block-menu:first-child .menu-toggle {
display: none;
}
-body:not(:target) .main-menu-reveal {
+body:not(:target) #header .block-menu:first-child .menu-toggle {
color: #333;
background: #ccc;
background: rgba(255, 255, 255, 0.7);
@@ -615,7 +604,7 @@ body:not(:target) .main-menu-reveal {
padding: 0.9em 10px 0.9em 10px;
z-index: 1000;
}
-body:not(:target) .main-menu-reveal:after {
+body:not(:target) #header .block-menu:first-child .menu-toggle:after {
content:"";
background: url(../../../misc/icons/ffffff/hamburger.svg) no-repeat;
background-size: contain;
@@ -625,21 +614,21 @@ body:not(:target) .main-menu-reveal:after {
position: absolute;
right: 10px; /* LTR */
}
-body:not(:target) #nav:target ~ .main-menu-reveal,
-body:not(:target) .main-menu-reveal--hide {
+body:not(:target) #header .block-menu:first-child .menu-toggle-target-show:target ~ .menu-toggle,
+body:not(:target) #header .block-menu:first-child .menu-toggle--hide {
display: none;
}
-body:not(:target) #nav:target ~ .main-menu-reveal--hide {
+body:not(:target) #header .block-menu:first-child .menu-toggle-target-show:target ~ .menu-toggle--hide {
display: block;
}
-[dir="rtl"] #secondary-menu-links {
+[dir="rtl"] #header .block-menu:nt-child(2) {
left: 10px;
right: auto;
}
-#main-menu-links .menu-hide a {
+#header .block-menu:first-child .menu .menu-hide a {
display: none;
}
-body:not(:target) #nav:target ~ #main-menu-links .menu-hide a {
+body:not(:target) #header .block-menu:first-child .menu-toggle-target-show:target ~ .menu .menu-hide a {
background-color: transparent;
border: none;
display: block;
@@ -652,35 +641,45 @@ body:not(:target) #nav:target ~ #main-menu-links .menu-hide a {
text-indent: -999em;
z-index: 1001;
}
-body:not(:target) #main-menu-links li {
+body:not(:target) #header .block-menu:first-child .menu li {
height: 0;
overflow: hidden;
}
-body:not(:target) #nav:target ~ #main-menu-links li {
+body:not(:target) #header .block-menu:first-child .menu-toggle-target-show:target ~ .menu li {
height: auto;
overflow: visible;
}
/* --------------- Secondary Menu ------------ */
-
-#secondary-menu-links {
+#header .block-menu:nth-child(2) {
+ position: absolute;
+ top: 0;
+ right: 0; /* LTR */
+}
+[dir="rtl"] #header .block-menu:nth-child(2) {
+ right: inherit;
+ left: 0;
+}
+#header .block-menu:nth-child(2) .menu {
float: right; /* LTR */
+ right: 0; /* LTR */
font-size: 0.929em;
margin: 0 10px;
}
-[dir="rtl"] #secondary-menu-links {
+[dir="rtl"] #header .block-menu:nth-child(2) .menu {
float: left;
}
-#secondary-menu-links li{
+#header .block-menu:nth-child(2) .menu li {
margin: 0;
padding: 0;
+ display: inline;
}
-#secondary-menu-links a {
+#header .block-menu:nth-child(2) .menu a {
display: inline-block;
padding: 0.8em;
}
-#secondary-menu-links a:hover,
-#secondary-menu-links a:focus {
+#header .block-menu:nth-child(2) .menu a:hover,
+#header .block-menu:nth-child(2) .menu a:focus {
text-decoration: underline;
}
@@ -1875,7 +1874,7 @@ div.admin-panel .description {
/* ------------ Header and Menus -------------------------- */
.region-header {
- margin: .5em 5px .75em;
+ margin: 0 5px 0;
}
#logo,
.site-logo {
@@ -1889,13 +1888,13 @@ div.admin-panel .description {
.site-branding-text {
padding: 10px 10px 8px;
}
- #main-menu-links {
+ #header .block-menu .menu {
margin: 0 5px;
padding: 0;
text-align: center;
}
- #main-menu-links li,
- body:not(:target) #main-menu-links li {
+ #header .block-menu:first-child .menu li,
+ body:not(:target) #header .block-menu:first-child .menu li {
float: left; /* LTR */
margin-right: 5px; /* LTR */
padding: 0;
@@ -1904,26 +1903,26 @@ div.admin-panel .description {
height: auto;
overflow: visible;
}
- [dir="rtl"] #main-menu-links li {
+ [dir="rtl"] #header .block-menu:first-child .menu li {
float: right;
margin-left: 5px;
margin-right: 0;
}
- #main-menu-links li:nth-child(3n) {
+ #header .block-menu:first-child .menu li:nth-child(3n) {
margin-right: -5px; /* LTR */
}
- [dir="rtl"] #main-menu-links li:nth-child(3n) {
+ [dir="rtl"] #header .block-menu:first-child .menu li:nth-child(3n) {
margin-left: -5px;
margin-right: 0;
}
- #main-menu-links a {
+ #header .block-menu:first-child .menu a {
float: none;
display: block;
border-radius: 8px;
margin-bottom: 5px;
padding: 0.9em 5px;
}
- body:not(:target) .main-menu-reveal {
+ body:not(:target) #header .block-menu:first-child .menu-toggle {
display: none;
}
}
@@ -1931,7 +1930,7 @@ div.admin-panel .description {
@media all and (min-width: 901px) {
.region-header {
- margin: 1em 5px 1.5em;
+ margin: 0 5px 0;
}
#logo,
.site-logo {
@@ -1954,13 +1953,13 @@ div.admin-panel .description {
.site-name {
font-size: 1.821em;
}
- #main-menu-links {
+ #header .block-menu:first-child .menu {
font-size: 0.929em;
margin: 0;
padding: 0 15px;
}
- #main-menu-links li,
- body:not(:target) #main-menu-links li {
+ #header .block-menu:first-child .menu li,
+ body:not(:target) #header .block-menu:first-child .menu li {
float: left; /* LTR */
list-style: none;
padding: 0 1px;
@@ -1969,26 +1968,26 @@ div.admin-panel .description {
height: auto;
overflow: visible;
}
- [dir="rtl"] #main-menu-links li {
+ [dir="rtl"] #header .block-menu:first-child .menu li {
float: right;
}
- #main-menu-links a {
+ #header .block-menu:first-child .menu a {
float: left; /* LTR */
padding: 0.7em 0.8em;
margin-bottom: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
- [dir="rtl"] #main-menu-links a {
+ [dir="rtl"] #header .block-menu:first-child .menu a {
float: right;
padding: 0.7em 0.8em;
}
- .featured #main-menu-links li a:active,
- .featured #main-menu-links li a.active {
+ .featured #header .block-menu:first-child .menu li a:active,
+ .featured #header .block-menu:first-child .menu li a.active {
background: #f0f0f0;
background: rgba(240, 240, 240, 1.0);
}
- body:not(:target) .main-menu-reveal {
+ body:not(:target) #header .block-menu:first-child .menu-toggle {
display: none;
}
}
diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
new file mode 100644
index 0000000..b6c0412
--- /dev/null
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -0,0 +1,22 @@
+{% extends "@system/block--system-menu-block.html.twig" %}
+
+{#
+/**
+ * @file
+ * Bartik's theme implementation for a menu block.
+ *
+ * @ingroup themeable
+ */
+#}
+{% set show_anchor = "show-" ~ attributes.id|clean_id %}
+{% set hide_anchor = "hide-" ~ attributes.id|clean_id %}
+{% block content %}
+ {# When rendering a menu without label, render a menu toggle. #}
+ {% if not configuration.label_display %}
+
+
+
+
+ {% endif %}
+ {{ content }}
+{% endblock %}
diff --git a/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
index 2456642..b6fb10f 100644
--- a/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -33,9 +33,6 @@
* added to make the site slogan visually hidden, but still accessible.
*
* 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):
@@ -79,13 +76,7 @@
#}