From 582927101e57078a2e88ad261a97a86754661fd0 Mon Sep 17 00:00:00 2001
From: James O'Toole <james.otoole@ubc.ca>
Date: Thu, 10 Oct 2024 17:02:48 -0700
Subject: [PATCH 1/2] Update a mobile nav trigger

Changes mobile nav trigger from a tag to button tag so that it can be triggered by keyboard.
Adds additional aria-label and aria-controls to improve screenreader feedback
---
 templates/layout/page.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
index 7a941ca..ca40921 100644
--- a/templates/layout/page.html.twig
+++ b/templates/layout/page.html.twig
@@ -114,7 +114,7 @@
           {% endif %}
         </div>
         <div id="ubc7-global-utility">
-          <button type="button" data-toggle="collapse" data-target="#ubc7-global-menu"><span>UBC Search</span></button>
+          <button type="button" data-toggle="collapse" data-target="#ubc7-global-menu" aria-label="UBC Search toggle" aria-controls="ubc7-global-menu"><span>UBC Search</span></button>
           <noscript><a id="ubc7-global-utility-no-script" href="http://www.ubc.ca/">UBC Search</a></noscript>
         </div>
       </div>
@@ -132,11 +132,11 @@
         <!-- Mobile Menu Icon -->
         <div class="navbar">
         <!-- TODO: -->
-          <a class="btn btn-navbar drawer-toggle--primary" data-toggle="collapse" data-target="#ubc7-unit-navigation">
+          <button class="btn btn-navbar drawer-toggle--primary" data-toggle="collapse" data-target="#ubc7-unit-navigation" aria-label="Mobile menu toggle" aria-controls="ubc7-unit-navigation" type="button">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-          </a>
+          </button>
         </div>
         <div id="ubc7-unit-name"{{ faculty_option != '' ? ' class="ubc7-single-element"' }}>
           <a href="{{ base_path }}">

From 5208adc1496227765d8d8defb0b1d9de046f67ac Mon Sep 17 00:00:00 2001
From: James O'Toole <james.otoole@ubc.ca>
Date: Thu, 10 Oct 2024 17:04:06 -0700
Subject: [PATCH 2/2] Adjust mobile trigger styles

Add adjustments to mobile trigger styles introduced by replacing the a tag with a button tag
---
 css/clf.drupal.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/css/clf.drupal.css b/css/clf.drupal.css
index 49e2394..841920c 100644
--- a/css/clf.drupal.css
+++ b/css/clf.drupal.css
@@ -167,3 +167,12 @@ a.close:hover {
   background-color: #324d6a;
   border-color: #00162f;
 }
+
+/* updating ubc7-unit-navigation mobile trigger from an a tag to a button tag alters layout, so we need to reassert the styling - this could be in a better location and done without using !important by increasing the selector specificity */
+#ubc7-unit .btn-navbar {
+  height: 35px !important;
+  width: 45px !important;
+  box-sizing: border-box !important;
+  margin-top: 7px !important;
+  padding: 11px 13px !important;
+}
\ No newline at end of file