Verified Commit 141cdc1f authored by Mike Herchel's avatar Mike Herchel
Browse files

fix: #3615331 Invalid ARIA attribute aria-toolbar-link__labelledby on toolbar... 

fix: #3615331 Invalid ARIA attribute aria-toolbar-link__labelledby on toolbar menus strips their accessible name

By: heddn
By: mherchel
By: f0ns
parent 51ff2c2f

core/themes/default_admin/templates/navigation/menu-region--middle.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<div class="admin-toolbar__item toolbar-block">

  {% set menu_heading_id = 'menu--' ~ menu_name %}

  <h2 id="{{ menu_heading_id }}" class="toolbar-block__title visually-hidden focusable">{{ title }}</h2>

  <ul class="toolbar-menu toolbar-menu toolbar-block__content toolbar-block__content--{{ menu_name }}" aria-toolbar-link__labelledby="{{ menu_heading_id }}">

  <ul class="toolbar-menu toolbar-menu toolbar-block__content toolbar-block__content--{{ menu_name }}" aria-labelledby="{{ menu_heading_id }}">

    {{ menus.menu_items(items, attribute) }}

  </ul>

</div>

core/themes/default_admin/templates/navigation/menu-region--top.html.twig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


<div class="admin-toolbar__item toolbar-block">

  <h2 id="{{ menu_id }}" class="toolbar-block__title visually-hidden">{{ 'Top Menus'|t }}</h2>

  <ul class="toolbar-menu toolbar-block__content" aria-toolbar-link__labelledby="{{ menu_id }}">

  <ul class="toolbar-menu toolbar-block__content" aria-labelledby="{{ menu_id }}">

    <li id="{{ item_id }}" class="toolbar-menu__item toolbar-menu__item--has-dropdown toolbar-menu__item--level-1">

      <button class="toolbar-link toolbar-link--has-icon toolbar-link--{{ menu_name|clean_class }}">

        <span class="toolbar-link__action">{{ 'Extend'|t }}</span>