Skip to content

Fix(5512): Tertiary menu list structure - avoid nested <li> #5527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
accesswatch wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Fix(5512): Tertiary menu list structure - avoid nested <li> #5527

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
654ec3f
Fix #5511: Give split-toggle buttons distinct accessible names
accesswatch Apr 20, 2026
cc4c21f
fix(a11y): fix WCAG 4.1.2 split-toggle accessible names in AZ Navbar
accesswatch Apr 20, 2026
914c309
fix(a11y): address Copilot review - i18n-safe labels and state-aware …
accesswatch Apr 20, 2026
76510e1
chore(a11y): remove Expand/Collapse verbs from visually-hidden submen…
accesswatch Apr 22, 2026
ff1f62f
Revert "chore(a11y): remove Expand/Collapse verbs from visually-hidde…
accesswatch Apr 22, 2026
1a99147
Resolve merge conflict: use i18n-safe submenu accessible name (combin…
accesswatch Apr 23, 2026
8d51491
Fix(5512): ensure tertiary menu structure avoids nested <li>; i18n su…
accesswatch Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions themes/custom/az_barrio/templates/navigation/menu--main-navbar-az.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{#
/**
* @file
* Arizona Barrio override to display a menu. Used when az_navbar theme setting is enabled.
* Arizona Barrio override to display a menu. Used when
* az_navbar theme setting is enabled.
*
* Available variables:
* - menu_name: The machine name of the menu.
Expand Down Expand Up @@ -60,7 +61,7 @@
{% if item.below %}
{% if not is_placeholder %}
<button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" data-bs-auto-close="outside" aria-expanded="false">
<span class="visually-hidden">{{ item.title }}</span>
<span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
</button>
{% endif %}
{{ menus.menu_links(item.below, attributes.removeClass('nav-item'), menu_level + 1, item) }}
Expand All @@ -69,8 +70,8 @@
{% if item.below %}
<div class="btn-group">
{{ link(item.title, item.url, { 'class': 'dropdown-item' }) }}
<button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" data-bs-auto-close="outside" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
<span class="visually-hidden">{{ item.title }}</span>
<button type="button" class="btn dropdown-toggle dropdown-toggle-split" data-bs-toggle="collapse" data-bs-target="#tertiary-{{ item.title|clean_class }}" aria-controls="tertiary-{{ item.title|clean_class }}" aria-expanded="{{ item.in_active_trail ? 'true' : 'false' }}">
<span class="visually-hidden">{{ 'Submenu for @title'|t({'@title': item.title}) }}</span>
</button>
</div>
{{ menus.menu_links(item.below, attributes, menu_level + 1, item) }}
Expand All @@ -88,3 +89,4 @@
</ul>
{% endif %}
{% endmacro %}

Loading