Merge pull request #93 from devgeniem/TMS-931

TMS-931: Navigation accessibility fixes
devgeniem · May 25, 2023 · a8718cd · a8718cd
2 parents 84cb8d7 + cd7425c
commit a8718cd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.12.1] – 2023-05-24
+
+### Changed
+
+- TMS-931: Navigation accessibility fixes
+
 ## [1.12.0] – 2023-04-11
 
 - PIEN-8157: PHP 8.1

diff --git a/partials/ui/menu/menu-item-dropdown-content.dust b/partials/ui/menu/menu-item-dropdown-content.dust
@@ -8,11 +8,13 @@
                 </a>
 
                 <div class="navbar-dropdown-items">
-                    <div class="navbar-grid">
+                    <ul class="navbar-grid">
                         {#sub_menu}
-                            {>"ui/menu/menu-item-simple" icon="chevron-right" /}
+                            <li>
+                                {>"ui/menu/menu-item-simple" icon="chevron-right" /}
+                            </li>
                         {/sub_menu}
-                    </div>
+                    </ul>
                 </div>
             </div>
         </div>

diff --git a/partials/ui/menu/menu-item-single.dust b/partials/ui/menu/menu-item-single.dust
@@ -1,5 +1,5 @@
 <li class="navbar-item navbar-item__single is-uppercase {#classes}{.}{@sep} {/sep}{/classes}">
-    <a href="{url}" class="is-arrowless pr-0 pl-0">
+    <a href="{url}" class="is-arrowless pr-0 pl-0" {?classes.is_current}aria-page='current'{/classes.is_current}>
         {title|s}
     </a>
 </li>
diff --git a/partials/ui/menu/menu-item.dust b/partials/ui/menu/menu-item.dust
@@ -5,7 +5,7 @@
 {?sub_menu}
     <li class="navbar-item has-dropdown {#classes}{.}{@sep} {/sep}{/classes}">
         <div class="navbar-dropdown-control">
-            <a class="navbar-link is-arrowless is-uppercase" href="{url}">
+            <a class="navbar-link is-arrowless is-uppercase" href="{url}" {?classes.is_current}aria-page="current"{/classes.is_current}>
                 {title|s}
             </a>
 

diff --git a/style.css b/style.css
@@ -1,7 +1,7 @@
 /*
  * Theme Name:  TMS Theme Filharmonia
  * Description: Tampere Multisite Filharmonia Theme
- * Version:     1.12.0
+ * Version:     1.12.1
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Template:    tms-theme-base