From bc3129e8c077a6423db708a67315a592c4ce7a7f Mon Sep 17 00:00:00 2001
From: Robin King <robin2.king@live.uwe.ac.uk>
Date: Mon, 20 Mar 2023 10:18:38 +0000
Subject: [PATCH] fix(*.html): add aria-current to main nav

---
 about.html    | 18 +++++++++---------
 index.html    | 18 +++++++++---------
 location.html | 18 +++++++++---------
 rules.html    | 18 +++++++++---------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/about.html b/about.html
index 414b422..5fa3fc8 100644
--- a/about.html
+++ b/about.html
@@ -14,8 +14,8 @@
     <header>
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
-        <nav id="main-navigation" class="navbar" aria-labelledby="Create Against Hate Main Navigation">
-            <ul role="menubar">
+        <nav id="main-navigation" aria-labelledby="Create Against Hate Main Navigation">
+            <ul role="menubar" class="navbar">
                 <li role="none">
                     <a href="#" role="menuitem">
                         <!-- .hideable-text exists for the mobile navigation which contains no text -->
@@ -23,7 +23,7 @@
                     </a>
                 </li>
                 <li role="none">
-                    <a href="about.html" role="menuitem">
+                    <a href="about.html" role="menuitem" aria-current="page">
                         <span class="icon--about"></span><span class="hideable-text"> About <i>Stop Hate UK</i></span>
                     </a>
                 </li>
@@ -38,13 +38,13 @@
                     </a>
                 </li>
             </ul>
-            <!-- Burger Menu -->
-            <button class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
-                <div class="hamburger--top"></div>
-                <div class="hamburger--middle"></div>
-                <div class="hamburger--bottom"></div>
-            </button>
         </nav>
+        <!-- Burger Menu -->
+        <button type="button" class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
+            <div class="hamburger--top"></div>
+            <div class="hamburger--middle"></div>
+            <div class="hamburger--bottom"></div>
+        </button>
     </header>
     <main>
         <!-- Hero -- uses class="hero" -- index.html && about.html -->
diff --git a/index.html b/index.html
index 6f71736..9508798 100644
--- a/index.html
+++ b/index.html
@@ -14,10 +14,10 @@
     <header>
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
-        <nav id="main-navigation" class="navbar" aria-labelledby="Create Against Hate Main Navigation">
-            <ul role="menubar">
+        <nav id="main-navigation" aria-labelledby="Create Against Hate Main Navigation">
+            <ul role="menubar" class="navbar">
                 <li role="none">
-                    <a href="#" role="menuitem">
+                    <a href="#" role="menuitem" aria-current="page">
                         <!-- .hideable-text exists for the mobile navigation which contains no text -->
                         <span class="icon--home"></span><span class="hideable-text"> Home</span>
                     </a>
@@ -38,13 +38,13 @@
                     </a>
                 </li>
             </ul>
-            <!-- Burger Menu -->
-            <button class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
-                <div class="hamburger--top"></div>
-                <div class="hamburger--middle"></div>
-                <div class="hamburger--bottom"></div>
-            </button>
         </nav>
+        <!-- Burger Menu -->
+        <button type="button" class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
+            <div class="hamburger--top"></div>
+            <div class="hamburger--middle"></div>
+            <div class="hamburger--bottom"></div>
+        </button>
     </header>
     <main id="home">
         <!-- Hero -- index.html && about.html -->
diff --git a/location.html b/location.html
index 7245e0c..6874217 100644
--- a/location.html
+++ b/location.html
@@ -14,8 +14,8 @@
     <header>
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
-        <nav id="main-navigation" class="navbar" aria-labelledby="Create Against Hate Main Navigation">
-            <ul role="menubar">
+        <nav id="main-navigation" aria-labelledby="Create Against Hate Main Navigation">
+            <ul role="menubar" class="navbar">
                 <li role="none">
                     <a href="#" role="menuitem">
                         <!-- .hideable-text exists for the mobile navigation which contains no text -->
@@ -33,18 +33,18 @@
                     </a>
                 </li>
                 <li role="none">
-                    <a href="location.html" role="menuitem">
+                    <a href="location.html" role="menuitem" aria-current="page">
                         <span class="icon--location"></span><span class="hideable-text"> How to find us</span>
                     </a>
                 </li>
             </ul>
-            <!-- Burger Menu -->
-            <button class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
-                <div class="hamburger--top"></div>
-                <div class="hamburger--middle"></div>
-                <div class="hamburger--bottom"></div>
-            </button>
         </nav>
+        <!-- Burger Menu -->
+        <button type="button" class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
+            <div class="hamburger--top"></div>
+            <div class="hamburger--middle"></div>
+            <div class="hamburger--bottom"></div>
+        </button>
     </header>
     <main>
         <!-- Map -->
diff --git a/rules.html b/rules.html
index 893ef99..ea4ca40 100644
--- a/rules.html
+++ b/rules.html
@@ -14,8 +14,8 @@
     <header>
         <img src="assets\main-logo\logo-long-dark.min.svg" alt="Create Against Hate Logo">
         <!-- Navigation Bar -- index.html && about.html && rules.html && location.html -->
-        <nav id="main-navigation" class="navbar" aria-labelledby="Create Against Hate Main Navigation">
-            <ul role="menubar">
+        <nav id="main-navigation" aria-labelledby="Create Against Hate Main Navigation">
+            <ul role="menubar" class="navbar">
                 <li role="none">
                     <a href="#" role="menuitem">
                         <!-- .hideable-text exists for the mobile navigation which contains no text -->
@@ -28,7 +28,7 @@
                     </a>
                 </li>
                 <li role="none">
-                    <a href="rules.html" role="menuitem">
+                    <a href="rules.html" role="menuitem" aria-current="page">
                         <span class="icon--rules"></span><span class="hideable-text"> Jam Rules</span>
                     </a>
                 </li>
@@ -38,13 +38,13 @@
                     </a>
                 </li>
             </ul>
-            <!-- Burger Menu -->
-            <button class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
-                <div class="hamburger--top"></div>
-                <div class="hamburger--middle"></div>
-                <div class="hamburger--bottom"></div>
-            </button>
         </nav>
+        <!-- Burger Menu -->
+        <button type="button" class="hamburger" aria-label="Open Main Navigation" aria-expanded="false">
+            <div class="hamburger--top"></div>
+            <div class="hamburger--middle"></div>
+            <div class="hamburger--bottom"></div>
+        </button>
     </header>
     <main>
         <!-- Rules -- uses class="text-section" -- about.html && rules.html && location.html -->
-- 
GitLab