Commit 77a9ea02 authored by alexpott's avatar alexpott

Issue #1800614 by falcon03, mgifford, LinL | jessebeach: Improve the...

Issue #1800614 by falcon03, mgifford, LinL | jessebeach: Improve the responsive toolbar accessibility.
parent 808098a2
......@@ -22,24 +22,26 @@
* @ingroup themeable
*/
#}
<nav{{ attributes }}>
<div{{ toolbar_attributes }}>
<div{{ attributes }}>
<nav{{ toolbar_attributes }}>
<h2 class="visually-hidden">{{ toolbar_heading }}</h2>
{% for tab in tabs %}
<div{{ tab.attributes }}>{{ tab.link }}</div>
{% endfor %}
</div>
</nav>
{% for tray in trays %}
{% spaceless %}
<div{{ tray.attributes }}>
<div class="toolbar-lining clearfix">
{% if tray.label %}
{% if tray.label %}
<nav class="toolbar-lining clearfix" role="navigation" aria-label="{{ tray.label }}">
<h3 class="toolbar-tray-name visually-hidden">{{ tray.label }}</h3>
{% endif %}
{% else %}
<nav class="toolbar-lining clearfix" role="navigation">
{% endif %}
{{ tray.links }}
</div>
</nav>
</div>
{% endspaceless %}
{% endfor %}
{{ remainder }}
</nav>
</div>
......@@ -79,15 +79,17 @@ function toolbar_element_info() {
// tests listing which produces a checkbox with attribute id="toolbar"
'id' => 'toolbar-administration',
'class' => array('toolbar'),
'role' => 'navigation',
'aria-label' => t('Site administration'),
'role' => 'group',
'aria-label' => t('Site administration toolbar'),
),
// Metadata for the administration bar.
'#bar' => array(
'#heading' => t('Toolbar items'),
'#attributes' => array(
'id' => 'toolbar-bar',
'class' => array('toolbar-bar', 'clearfix'),
'class' => array('toolbar-bar', 'clearfix',),
'role' => 'navigation',
'aria-label' => t('Toolbar items'),
),
),
);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment