From 1275f18458dba8ad8bf04e14a86ac3605e8c17dd Mon Sep 17 00:00:00 2001
From: Yukiko Gannett <yukikogannett@gmail.com>
Date: Wed, 12 Apr 2023 15:17:31 -0400
Subject: [PATCH 1/4] test edit

---
 .../source/_patterns/02-molecules/main-nav.twig      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
index 4500b576b6..b460ca6ff2 100644
--- a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
+++ b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
@@ -3,17 +3,17 @@
     {% for nav in mainNav %}
       {% set buttonId =  'button' ~ loop.index %}
       {% set menuId =  'menu' ~ loop.index %}
-      <li role="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 role="menuitem" class="ma__main-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-toggle' : 'js-main-nav-top-link' }}" tabindex="-1">
         {% if nav.subNav %}
-          <button type="button" role="menuitem" id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false" tabindex="0">
+          <button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false" tabindex="0">
               <span class="visually-hidden show-label">Show the sub topics of </span>
               {{ 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">{{ subNav.text }}</a>
+                <li role="menuitem" class="ma__main-nav__subitem">
+                  <a href="{{ subNav.href }}" class="ma__main-nav__link">{{ subNav.text }}</a>
                 </li>
               {% endfor %}
             </ul>
@@ -24,9 +24,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 href="{{ nav.href }}" class="ma__main-nav__top-link {{ altClass }}" tabindex="0">{{ nav.text }}</a>
         {% else %}
-          <button type="button" role="menuitem" id="{{ buttonId }}" class="ma__main-nav__top-link" tabindex="{{ loop.first? 0 : -1 }}">{{ nav.text }}</button>
+          <button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" tabindex="{{ loop.first? 0 : -1 }}">{{ nav.text }}</button>
         {% endif %}
       </li>
     {% endfor %}

From e0c39d43a9e904500ce72e5a825436df49af8e32 Mon Sep 17 00:00:00 2001
From: Yukiko Gannett <yukikogannett@gmail.com>
Date: Wed, 12 Apr 2023 15:38:31 -0400
Subject: [PATCH 2/4] test edit2

---
 .../styleguide/source/_patterns/02-molecules/main-nav.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
index b460ca6ff2..5dbddfa45d 100644
--- a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
+++ b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
@@ -12,8 +12,8 @@
           <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="menuitem" class="ma__main-nav__subitem">
-                  <a href="{{ subNav.href }}" class="ma__main-nav__link">{{ subNav.text }}</a>
+                <li role="none" class="ma__main-nav__subitem">
+                  <a role="menuitem" href="{{ subNav.href }}" class="ma__main-nav__link">{{ subNav.text }}</a>
                 </li>
               {% endfor %}
             </ul>

From f1b1e0ab45910238ad633e9911ee1798c1cadc31 Mon Sep 17 00:00:00 2001
From: Yukiko Gannett <yukikogannett@gmail.com>
Date: Wed, 12 Apr 2023 15:52:46 -0400
Subject: [PATCH 3/4] test edit 3

---
 .../styleguide/source/_patterns/02-molecules/main-nav.twig    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
index 5dbddfa45d..16fd7c2ba1 100644
--- a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
+++ b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
@@ -3,7 +3,7 @@
     {% for nav in mainNav %}
       {% set buttonId =  'button' ~ loop.index %}
       {% set menuId =  'menu' ~ loop.index %}
-      <li role="menuitem" 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 role="{{ nav.href ? 'none' : 'menuitem' }}" class="ma__main-nav__item {{ nav.active ? 'is-active' : '' }} {{ nav.subNav ? 'has-subnav js-main-nav-toggle' : 'js-main-nav-top-link' }}" tabindex="-1">
         {% if nav.subNav %}
           <button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false" tabindex="0">
               <span class="visually-hidden show-label">Show the sub topics of </span>
@@ -24,7 +24,7 @@
           {% if 'covid' in nav.text|lower %}
             {% set altClass = 'cv-alternate-style' %}
           {% endif %}
-          <a 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 }}" tabindex="0">{{ nav.text }}</a>
         {% else %}
           <button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" tabindex="{{ loop.first? 0 : -1 }}">{{ nav.text }}</button>
         {% endif %}

From ca8ec101a8f3196a6bd62a0c92e1ac526bbe1c6e Mon Sep 17 00:00:00 2001
From: Yukiko Gannett <yukikogannett@gmail.com>
Date: Wed, 12 Apr 2023 17:04:14 -0400
Subject: [PATCH 4/4] test edit 4

---
 .../styleguide/source/_patterns/02-molecules/main-nav.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
index 16fd7c2ba1..16adf12439 100644
--- a/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
+++ b/packages/patternlab/styleguide/source/_patterns/02-molecules/main-nav.twig
@@ -3,7 +3,7 @@
     {% for nav in mainNav %}
       {% set buttonId =  'button' ~ loop.index %}
       {% set menuId =  'menu' ~ loop.index %}
-      <li role="{{ nav.href ? 'none' : 'menuitem' }}" 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 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">
         {% if nav.subNav %}
           <button type="button" id="{{ buttonId }}" class="ma__main-nav__top-link" aria-haspopup="true" aria-expanded="false" tabindex="0">
               <span class="visually-hidden show-label">Show the sub topics of </span>