From 81d4a57c25bf8bd83de749cd6d90d3f91039d6fe Mon Sep 17 00:00:00 2001
From: Cami Gonzales <gonzcami@oregonstate.edu>
Date: Fri, 6 Dec 2024 12:16:17 -0800
Subject: [PATCH 1/3] Update heading levels to maintain semantic order

---
 .../mozorg/templates/mozorg/contact/contact-landing.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bedrock/mozorg/templates/mozorg/contact/contact-landing.html b/bedrock/mozorg/templates/mozorg/contact/contact-landing.html
index 840250943e2..d3ccb603af1 100644
--- a/bedrock/mozorg/templates/mozorg/contact/contact-landing.html
+++ b/bedrock/mozorg/templates/mozorg/contact/contact-landing.html
@@ -44,7 +44,7 @@ <h2>Contacting Mozilla</h2>
 
       <div class="contact-sections">
         <div class="contact-section">
-          <h4>Find us online</h4>
+          <h3>Find us online</h3>
           <ul class="mzp-u-list-styled">
             <li><a href="https://facebook.com/mozilla" hreflang="en-US" rel="external">Facebook</a></li>
             <li><a href="{{ mozilla_twitter_url() }}" rel="external">X (formerly Twitter)</a></li>
@@ -53,7 +53,7 @@ <h4>Find us online</h4>
         </div>
 
         <div class="contact-section">
-          <h4>Join us</h4>
+          <h3>Join us</h3>
           <ul class="mzp-u-list-styled">
             <li><a href="{{ url('mozorg.contribute') }}">Get involved</a></li>
             <li><a href="{{ url('careers.home') }}">Career opportunities</a></li>
@@ -62,7 +62,7 @@ <h4>Join us</h4>
         </div>
 
         <div class="contact-section">
-          <h4>Questions &amp; feedback</h4>
+          <h3>Questions &amp; feedback</h3>
           <ul class="mzp-u-list-styled">
             <li><a href="https://support.mozilla.org/">Get support</a></li>
             <li><a href="{{ url('foundation.licensing') }}">Browser distribution &amp; licensing</a></li>

From 20bf00df62d0b164137b654dc9caca994f4276fb Mon Sep 17 00:00:00 2001
From: Cami Gonzales <gonzcami@oregonstate.edu>
Date: Fri, 6 Dec 2024 12:17:33 -0800
Subject: [PATCH 2/3] Remove role=navigation and add <nav> wrapper

---
 .../mozorg/contact/includes/tab-nav.html      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html b/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
index 59660211a54..4c21dc15928 100644
--- a/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
+++ b/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
@@ -4,14 +4,16 @@
  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
 
-<ul class="category-tabs" role="navigation">
-  <li {% if current == 'contact' %}class="current"{% endif %} data-id="contact">
-    <a href="{{ url('mozorg.contact.contact-landing') }}">Contact us</a>
-  </li>
-  <li {% if current == 'spaces' %}class="current"{% endif %} data-id="spaces">
-    <a href="{{ url('mozorg.contact.spaces.spaces-landing') }}">Spaces</a>
-  </li>
-  <li data-id="communities">
-    <a href="https://community.mozilla.org/groups/">Communities</a>
-  </li>
-</ul>
+<nav>
+  <ul class="category-tabs">
+    <li {% if current == 'contact' %}class="current"{% endif %} data-id="contact">
+      <a href="{{ url('mozorg.contact.contact-landing') }}">Contact us</a>
+    </li>
+    <li {% if current == 'spaces' %}class="current"{% endif %} data-id="spaces">
+      <a href="{{ url('mozorg.contact.spaces.spaces-landing') }}">Spaces</a>
+    </li>
+    <li data-id="communities">
+      <a href="https://community.mozilla.org/groups/">Communities</a>
+    </li>
+  </ul>
+</nav>

From b6ce35c4b618230956b44ed335f6c30f98702ad7 Mon Sep 17 00:00:00 2001
From: Camille Gonzales <122317193+camillegonzales@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:45:59 -0800
Subject: [PATCH 3/3] Added aria-label to navigation

Co-authored-by: maureenlholland <maureen@silverorange.com>
---
 bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html b/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
index 4c21dc15928..11ce8281abf 100644
--- a/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
+++ b/bedrock/mozorg/templates/mozorg/contact/includes/tab-nav.html
@@ -4,7 +4,7 @@
  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #}
 
-<nav>
+<nav aria-label="Category">
   <ul class="category-tabs">
     <li {% if current == 'contact' %}class="current"{% endif %} data-id="contact">
       <a href="{{ url('mozorg.contact.contact-landing') }}">Contact us</a>