Skip to content

Commit 55e02bb

Browse files
committed
fix some of the axe warnings for the navbar
1 parent 4e9be0c commit 55e02bb

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

addon/components/es-navbar/link/component.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export default Component.extend({
1010
tagName: 'li',
1111
tabIndex: 0,
1212

13+
role: 'menuitem',
14+
15+
attributeBindings: ['role'],
1316
classNameBindings: ['isDropdown:dropdown'],
1417
isDropdown: equal('link.type', 'dropdown'),
1518

addon/components/es-navbar/link/template.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{#if (eq link.type "link")}}
22
<a
3-
role="menuitem"
3+
class="navbar-link__dropdown"
44
aria-haspopup="true"
55
aria-expanded="false"
66
href={{link.href}}
@@ -11,7 +11,7 @@
1111
{{/if}}
1212
{{#if (eq link.type "dropdown")}}
1313
<a
14-
role="menuitem"
14+
class="navbar-link__dropdown"
1515
aria-haspopup="true"
1616
aria-expanded="false"
1717
href="javascript:void(0)"
@@ -24,7 +24,7 @@
2424
{{#if (eq item.type "link")}}
2525
<li role="none">
2626
<a
27-
role="menuitem"
27+
class="navbar-link__dropdown-item"
2828
href={{item.href}}
2929
tabindex="-1"
3030
>

addon/styles/components/es-navbar.css

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ nav.es-navbar {
66
width: 100%;
77
height: 2.5rem;
88
max-width: var(--container-width-large);
9-
background-color: $orange;
109

1110
& .navbar-brand {
1211
margin-right: 2em;
@@ -52,42 +51,36 @@ ul[role="menubar"][aria-expanded="false"] {
5251
max-height: 0;
5352
}
5453

55-
ul[role="menubar"] [role="menuitem"] {
54+
.navbar-link__dropdown {
5655
height: 100%;
5756
padding: 0 .5em;
5857
line-height: $menu-height;
5958
}
6059

61-
ul[role="menubar"] [role="menuitem"]:focus,
62-
ul[role="menubar"] [role="menuitem"]:hover {
60+
.navbar-link__dropdown:focus,
61+
.navbar-link__dropdown:hover {
6362
background-color: white;
6463
color: $menu-orange;
6564
}
6665

67-
ul[role="menubar"] a[role="menuitem"] {
66+
.navbar-link__dropdown {
6867
font-size: 0.8em;
6968
text-decoration: none;
7069
color: white;
7170
}
7271

73-
ul li[aria-expanded=true] ul.dropdown a[role="menuitem"]:focus,
74-
ul li[aria-expanded=true] ul.dropdown a[role="menuitem"]:hover {
72+
li[aria-expanded=true] .navbar-link__dropdown-item:focus,
73+
li[aria-expanded=true] .navbar-link__dropdown-item:hover {
7574
outline: 0;
7675
}
7776

78-
ul.dropdown a[role="menuitem"] {
77+
.navbar-link__dropdown-item {
7978
color: $menu-orange;
8079
padding: 0 1em;
8180
font-size: 0.8em;
8281
line-height: 2.5em;
8382
}
8483

85-
ul[role="menubar"] [role="menuitem"]:focus,
86-
ul[role="menubar"] [role="menuitem"]:hover {
87-
background-color: white;
88-
color: $menu-orange;
89-
}
90-
9184
ul[role="menubar"] li {
9285
list-style: none;
9386
margin: 0;
@@ -128,8 +121,8 @@ ul[role="menubar"] ul[role="menu"] {
128121
}
129122

130123

131-
ul[role="menubar"] ul[role="menu"] li a {
132-
/* display: block; */
124+
.navbar-link__dropdown-item {
125+
display: block;
133126
width: 15em;
134127
}
135128

@@ -171,7 +164,7 @@ ul[role="menubar"] ul[role="menu"] a[aria-haspopup="true"]:after {
171164
}
172165
}
173166

174-
// Large devices (desktops, 992px and up)
167+
/* Large devices (desktops, 992px and up) */
175168
@media (min-width: 992px) {
176169
nav.es-navbar div.container {
177170
display: flex;
@@ -213,8 +206,8 @@ ul[role="menubar"] ul[role="menu"] a[aria-haspopup="true"]:after {
213206
max-height: inherit;
214207
}
215208

216-
ul li[aria-expanded=true] ul.dropdown a[role="menuitem"]:focus,
217-
ul li[aria-expanded=true] ul.dropdown a[role="menuitem"]:hover {
209+
li[aria-expanded=true] .navbar-link__dropdown-item:focus,
210+
li[aria-expanded=true] .navbar-link__dropdown-item:hover {
218211
background-color: $orange;
219212
color: white;
220213
outline: inherit;

addon/styles/global.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:root {
22
--container-width-large: 64em;
33
--color-dark: #1C1E23;
4-
--color-light: #FFE6E6;
4+
--color-light: #FFF;
55
}
66

77
body {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<header class="es-header" aria-role="banner" ...attributes>
1+
<header class="es-header" ...attributes>
22
{{yield}}
33
</header>

0 commit comments

Comments
 (0)