Verified Commit dcdd4cfc authored by Dave Long's avatar Dave Long
Browse files

fix: #3439643 Improve how and what navigation block titles are communicating to screenreader users

By: rkoller
By: katannshaw
By: ckrina
By: sjhunsinger
By: scottatdrake
By: hktang
By: joshmiller
By: mrcgomez
By: emoleee
By: thehuffman
By: deivalko
By: kentr
By: mherchel
By: mgifford
By: bernardm28
(cherry picked from commit adb94030)
parent 21c5ec4d
Loading
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@
  {# This lil' div will get the Drupal.displace() attributes added to it via JS. #}
  <div class="admin-toolbar__displace-placeholder"></div>

  <nav class="admin-toolbar__scroll-wrapper" aria-label="{{ 'Administrative sidebar'|t }}">
  {% set nav_id = 'admin-toolbar__scroll-wrapper-' ~ random() %}
  <nav class="admin-toolbar__scroll-wrapper" aria-labelledby="{{ nav_id }}">
    <h2 id="{{ nav_id }}" class="visually-hidden">{{ 'Administrative sidebar'|t }}</h2>
    {% set title_menu = 'admin-toolbar-title'|clean_unique_id %}
    {# @todo - We should get rid of this ID below. #}
    <div{{ region_attributes.content
+4 −4
Original line number Diff line number Diff line
@@ -31,15 +31,15 @@
<div{{ attributes.addClass('toolbar-block') }}>
  {{ title_prefix }}
  {% if configuration.label_display %}
    <h2{{ title_attributes
    <h3{{ title_attributes
      .addClass('toolbar-block__title')
      .setAttribute('data-drupal-tooltip', configuration.label)
      .setAttribute('data-drupal-tooltip-class', 'toolbar-block__title-tooltip')
    }}>{{ configuration.label }}</h2>
    }}>{{ configuration.label }}</h3>
  {% else %}
    <h2{{ title_attributes
    <h3{{ title_attributes
      .addClass('visually-hidden', 'focusable')
    }}>{{ configuration.label }}</h2>
    }}>{{ configuration.label }}</h3>
  {% endif %}
  {{ title_suffix }}
  {% block content %}