Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<div class="ma__main__hamburger-nav">
<ul role="menubar" class="ma__main__hamburger-nav__items js-main-nav-hamburger">
<ul class="ma__main__hamburger-nav__items js-main-nav-hamburger">
{% for nav in mainNav %}
{% set buttonId = 'button-mobile-' ~ loop.index %}
{% set menuId = 'menu-mobile-' ~ loop.index %}
<li role="{{ nav.subNav ? 'menuitem' : 'none' }}" class="ma__main__hamburger-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-hamburger-toggle' : 'js-main-nav-hamburger-top-link' }}">
<li class="ma__main__hamburger-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-hamburger-toggle' : 'js-main-nav-hamburger-top-link' }}">
{% if nav.subNav %}
<button type="button" id="{{ buttonId }}" class="ma__main__hamburger-nav__top-link js-main-nav-hamburger__top-link" aria-expanded="false" aria-haspopup="true">
<span class="ma__visually-hidden show-label">Show the sub topics of </span>
<button id="{{ buttonId }}" class="ma__main__hamburger-nav__top-link js-main-nav-hamburger__top-link" aria-expanded="false" aria-haspopup="true">
{{ nav.text }}
<span class="toggle-indicator" aria-hidden="true"></span>
</button>
Expand All @@ -28,7 +27,7 @@
<a role="menuitem" href="{{ nav.href }}" class="ma__main__hamburger-nav__top-link {{ altClass }}">{{ nav.text
}}</a>
{% else %}
<button type="button" id="{{ buttonId }}" class="ma__main__hamburger-nav__top-link">{{ nav.text }}</button>
<button id="{{ buttonId }}" class="ma__main__hamburger-nav__top-link">{{ nav.text }}</button>
{% endif %}
</li>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<div class="ma__main-nav">
<ul role="menubar" class="ma__main-nav__items js-main-nav">
<ul class="ma__main-nav__items js-main-nav">
{% for nav in mainNav %}
{% set buttonId = 'button' ~ loop.index %}
{% set menuId = 'menu' ~ loop.index %}
<li role="{{ nav.subNav ? 'menuitem' : 'none' }}" class="ma__main-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-toggle' : 'js-main-nav-top-link' }}" tabindex="-1">
<li class="ma__main-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-toggle' : 'js-main-nav-top-link' }}">
{% if nav.subNav %}
<button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false" tabindex="0">
<span class="ma__visually-hidden show-label">Show the sub topics of </span>
<button id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false">
{{ nav.text }}
</button>
<div class="ma__main-nav__subitems js-main-nav-content is-closed">
<ul id="{{ menuId }}" role="menu" aria-labelledby="{{ buttonId }}" class="ma__main-nav__container">
{% for subNav in nav.subNav %}
<li role="none" class="ma__main-nav__subitem">
<a role="menuitem" href="{{ subNav.href }}" class="ma__main-nav__link" tabindex="0">{{ subNav.text }}</a>
<a role="menuitem" href="{{ subNav.href }}" class="ma__main-nav__link">{{ subNav.text }}</a>
</li>
{% endfor %}
</ul>
Expand All @@ -24,9 +23,9 @@
{% if 'covid' in nav.text|lower %}
{% set altClass = 'cv-alternate-style' %}
{% endif %}
<a role="menuitem" href="{{ nav.href }}" class="ma__main-nav__top-link {{ altClass }}" tabindex="0">{{ nav.text }}</a>
<a role="menuitem" href="{{ nav.href }}" class="ma__main-nav__top-link {{ altClass }}">{{ nav.text }}</a>
{% else %}
<button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" tabindex="{{ loop.first? 0 : -1 }}">{{ nav.text }}</button>
<button id="{{ buttonId }}" class="ma__main-nav__top-link" tabindex="{{ loop.first? 0 : -1 }}">{{ nav.text }}</button>
{% endif %}
</li>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<div class="ma__sticky-nav__link js-scroll-anchors-toggle is-title" aria-hidden="true">
<span>Table of Contents</span>
</div>
<ul role="menubar" class="ma__sticky-nav__container">
<ul class="ma__sticky-nav__container">
{% for anchorLink in stickyNav.anchorLinks %}
<li role="menuitem" class="ma__sticky-nav__link js-scroll-anchors-link {{ loop.first ? 'is-top' : '' }}">
<li class="ma__sticky-nav__link js-scroll-anchors-link {{ loop.first ? 'is-top' : '' }}">
<a href="#{{ anchorLink.href }}"
title="{{ anchorLink.info }}">{{ anchorLink.text }}</a>
</li>
Expand Down