diff --git a/assets/js/theme/common/collapsible.js b/assets/js/theme/common/collapsible.js index 101d4b82b3..50911611ce 100644 --- a/assets/js/theme/common/collapsible.js +++ b/assets/js/theme/common/collapsible.js @@ -82,6 +82,7 @@ export class Collapsible { // Assign DOM attributes this.$target.attr('aria-hidden', this.isCollapsed); this.$toggle + .attr('aria-label', $toggle.text().trim()) .attr('aria-controls', $target.attr('id')) .attr('aria-expanded', this.isOpen); diff --git a/templates/components/common/navigation-list-alternate.html b/templates/components/common/navigation-list-alternate.html index 263fcd6e12..dcbb03500e 100644 --- a/templates/components/common/navigation-list-alternate.html +++ b/templates/components/common/navigation-list-alternate.html @@ -1,8 +1,20 @@ {{#if children}} - - {{name}} + + {{name}} + {{> components/common/navigation-dropdown}} {{else}} - {{name}} + + {{name}} + {{/if}} diff --git a/templates/components/common/navigation-list.html b/templates/components/common/navigation-list.html index 3afee21bea..578bb1a9a4 100644 --- a/templates/components/common/navigation-list.html +++ b/templates/components/common/navigation-list.html @@ -1,41 +1,71 @@ {{#if children}} - - {{name}} + + {{name}} + {{else}} -{{name}} + + {{name}} + {{/if}} diff --git a/templates/components/common/navigation-menu.html b/templates/components/common/navigation-menu.html index 3983d0c587..08455e8a5a 100644 --- a/templates/components/common/navigation-menu.html +++ b/templates/components/common/navigation-menu.html @@ -16,7 +16,12 @@ {{#unless theme_settings.hide_content_navigation}} {{#each pages}} {{/each}} {{/unless}} @@ -24,14 +29,28 @@