Skip to content
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

TMS-1015: Header accessibility fixes #493

Merged
merged 2 commits into from
Mar 18, 2024
Merged

TMS-1015: Header accessibility fixes #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e4509a
TMS-1015: Header accessibility fixes
eebbi Feb 28, 2024
74a27ad
Merge branch 'master' into TMS-1015
eebbi Mar 18, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- TMS-996: Change bold image-caption text to normal
- TMS-1009: Fix error when fetching Eventz response with languages other than fi & en
- TMS-1015: Header accessibility fixes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image


## [1.54.5] - 2024-02-01

Expand Down
4 changes: 2 additions & 2 deletions partials/shared/header-inner.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@

{?Header.lang_nav_horizontal}
<div class="is-hidden-touch">
{>"ui/menu/language-nav" links=Header.language_nav.links /}
{>"ui/menu/language-nav" links=Header.language_nav.links id="lang-menu" /}
</div>
{/Header.lang_nav_horizontal}

{?Header.lang_nav_horizontal}
<div class="is-hidden-desktop">
{?Header.language_nav.links_without_current}
{>"ui/menu/language-nav" links=Header.language_nav.links_without_current /}
{>"ui/menu/language-nav" links=Header.language_nav.links_without_current id="lang-menu-mobile" /}
{:else}
{>"ui/menu/language-nav-dropdown" links=Header.language_nav.links /}
{/Header.language_nav.links_without_current}
Expand Down
2 changes: 1 addition & 1 deletion partials/ui/menu/language-nav.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{?links.all}
<nav aria-label="{Strings.s.header.language_navigation|s}">
<ul id="lang-menu"
<ul id="{id|attr}"
class="lang-nav--horizontal ml-6-desktop is-flex is-unstyled is-uppercase has-text-weight-semibold is-family-secondary">
{#links.all}
<li class="ml-2-desktop">
Expand Down
10 changes: 5 additions & 5 deletions partials/ui/menu/menu-item-dropdown.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
<div class="navbar-dropdown-control">
<a class="navbar-link dropdown-trigger is-arrowless" href="#">
{title|s}
{title|html}
</a>

<button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-dropdown-{$idx}">
<span class="is-sr-only">{data.open_menu|s}</span>
{Strings.s}
<button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-dropdown-{$idx|attr}">
<span class="is-sr-only">{data.open_menu|html}</span>
{Strings.s|html}

<span aria-hidden="true">
{>"ui/icon" icon="chevron-down" class="icon--medium" /}
Expand All @@ -20,6 +20,6 @@
</div>

{>"ui/menu/menu-item-dropdown-content" /}

</li>
{/sub_menu}
10 changes: 5 additions & 5 deletions partials/ui/menu/menu-item.dust
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
{?sub_menu}
<li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
<div class="navbar-dropdown-control">
<a class="navbar-link is-arrowless" href="{url}">
{title|s}
<a class="navbar-link is-arrowless" href="{url|url}">
{title|html}
</a>

<button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx}">
<span class="is-sr-only">{data.open_menu|s}</span>
<button class="dropdown-toggler" aria-expanded=false aria-controls="js-navbar-menu-item-{$idx|attr}">
<span class="is-sr-only">{data.open_menu|html}</span>

<span aria-hidden="true">
{>"ui/icon" icon="chevron-down" class="icon--medium" /}
</span>
</button>
</div>

<div class="navbar-dropdown is-hidden-touch" id="js-navbar-menu-item-{$idx}">
<div class="navbar-dropdown is-hidden-touch" id="js-navbar-menu-item-{$idx|attr}">
{#sub_menu}
{>"ui/menu/menu-item-simple" /}
{/sub_menu}
Expand Down
Loading