From d41b239861ad91f32f2e0abf8ea5f3025e91d5de Mon Sep 17 00:00:00 2001
From: Paul Stanton <paul@coffeepowered.co.uk>
Date: Wed, 30 Apr 2025 12:14:35 +0100
Subject: [PATCH 1/2] Delete fonts/_config.fonts.scss

---
 fonts/_config.fonts.scss | 49 ----------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 fonts/_config.fonts.scss

diff --git a/fonts/_config.fonts.scss b/fonts/_config.fonts.scss
deleted file mode 100644
index fe53fa2bbe..0000000000
--- a/fonts/_config.fonts.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-$font-family-light:   'proxima_novalight', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-$font-family-regular: 'proxima_nova_rgregular', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-$font-family-heading: 'code_pro_bold', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-$font-family-heading-light: 'code_pro_regular', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-$font-family-icons:   'Font Awesome 6 Free';
-$font-family-brands:  'Font Awesome 6 Brands';
-
-// Font awesome
-$fa-path: '../fonts/fontawesome-free-6.0.0-web' !default;
-$fa-font-path: $fa-path + '/webfonts' !default;
-$fa-css-prefix: 'icon';
-
-@import '../fonts/fontawesome-free-6.0.0-web/scss/fontawesome';
-@import '../fonts/fontawesome-free-6.0.0-web/scss/regular';
-@import '../fonts/fontawesome-free-6.0.0-web/scss/solid';
-@import '../fonts/fontawesome-free-6.0.0-web/scss/brands';
-@import '../fonts/fontawesome-free-6.0.0-web/scss/v4-shims';
-
-@font-face {
-  font-family: 'proxima_novalight';
-  src: url($font-path + 'proxima_nova/proximanova-light.woff2') format('woff2'),
-       url($font-path + 'proxima_nova/proximanova-light.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'proxima_nova_rgregular';
-  src: url($font-path + 'proxima_nova/proximanova-regular.woff2') format('woff2'),
-       url($font-path + 'proxima_nova/proximanova-regular.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'code_pro_bold';
-  src: url($font-path + 'code_pro/code_pro_bold_lc-webfont.woff2') format('woff2'),
-       url($font-path + 'code_pro/code_pro_bold_lc-webfont.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'code_pro_regular';
-  src: url($font-path + 'code_pro/code_pro_lc-webfont.woff2') format('woff2'),
-       url($font-path + 'code_pro/code_pro_lc-webfont.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}

From 7ce21949424278a806f2631f0c5c4d01c1fdd425 Mon Sep 17 00:00:00 2001
From: steveojadu <54797618+steveojadu@users.noreply.github.com>
Date: Tue, 13 May 2025 09:08:16 +0100
Subject: [PATCH 2/2] Move aria-labelledby to <ul>

---
 views/pulsar/v2/helpers/nav.html.twig | 61 ++++++++++++---------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/views/pulsar/v2/helpers/nav.html.twig b/views/pulsar/v2/helpers/nav.html.twig
index 78310a25a1..4d178b6625 100644
--- a/views/pulsar/v2/helpers/nav.html.twig
+++ b/views/pulsar/v2/helpers/nav.html.twig
@@ -21,7 +21,6 @@
     </div>
 
     <div class="nav-secondary t-nav-secondary nav-flyout" id="aria-secondary-nav">
-
         <div class="nav-controls">
             <button class="nav-controls__close" data-nav-action="close" tabindex="1">{{ html.icon('remove', { 'label': 'Close expanded menu' }) }}</button>
         </div>
@@ -29,10 +28,10 @@
         {% if options.data is iterable %}
             {% for options in options.data %}
                 {% if options.items is defined and options.items is iterable %}
-                    <div class="nav-list" id="{{ options.label|lower|replace({' ': '-'}) }}" data-nav="{{ options.href }}" aria-labelledby="aria-secondary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">
+                    <div class="nav-list" id="{{ options.label|lower|replace({' ': '-'}) }}" data-nav="{{ options.href }}">
                         <h2 class="nav-item nav-item--header t-nav-header" id="aria-secondary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">{{ options.label|raw }}</h2>
 
-                        <ul class="nav-items">
+                        <ul class="nav-items" aria-labelledby="aria-secondary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">
                             {% set heading_id = 'aria-secondary-nav-heading-' ~ options.label|raw %}
                             {% for menu_blocks in options.items %}
                                 {% for item_options in menu_blocks %}
@@ -46,65 +45,57 @@
                             {% endfor %}
                         </ul>
                     </div>
-
                 {% endif %}
             {% endfor %}
         {% endif %}
-
     </div>
 
     <div class="nav-tertiary t-nav-tertiary nav-flyout" id="aria-tertiary-nav">
-
         <div class="nav-controls">
             <button class="nav-controls__close" data-nav-action="close" tabindex="1">{{ html.icon('remove', { 'label': 'Close expanded menu' }) }}</button>
         </div>
 
-        <div class="nav-list" aria-labelledby="aria-tertiary-nav-heading">
+        <div class="nav-list">
             <h2 class="nav-item nav-item--header t-nav-header" id="aria-tertiary-nav-heading">More Categories</h2>
             {% set heading_id = 'aria-tertiary-nav-heading' %}
             {% set aria_controls = 'aria-quaternary-nav' %}
             {% if options.data is iterable %}
-                <ul class="nav-items">
+                <ul class="nav-items" aria-labelledby="aria-tertiary-nav-heading">
                     {% for label, options in options.data %}
                         {{ nav.nav_item(options, heading_id, aria_controls) }}
                     {% endfor %}
                 </ul>
             {% endif %}
         </div>
-
     </div>
 
     <div class="nav-quaternary t-nav-quaternary nav-flyout" id="aria-quaternary-nav">
-
         <div class="nav-controls">
             <button class="nav-controls__close-ltr" data-nav-action="close" tabindex="1">{{ html.icon('remove', { 'label': 'Close expanded menu' }) }}</button>
         </div>
 
-           {% if options.data is iterable %}
-               {% for options in options.data %}
-                   {% if options.items is defined and options.items is iterable %}
-
-                        {% set heading_id = 'aria-quaternary-nav-heading-' ~ options.label|raw %}
-                        <div class="nav-list" data-nav="{{ options.href }}" aria-labelledby="aria-quaternary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">
-                           <h2 class="nav-item nav-item--header t-nav-header" id="aria-quaternary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">{{ options.label|raw }}</h2>
-
-                           <ul class="nav-items">
-                               {% for menu_blocks in options.items %}
-                                   {% for item_options in menu_blocks %}
-                                       {{ nav.nav_item(item_options, heading_id) }}
-                                   {% endfor %}
-                                   {% if not loop.last %}
-                                       <li class="nav-item nav-item__divider">
-                                           <hr class="nav-divider t-nav-divider" />
-                                       </li>
-                                   {% endif %}
-                               {% endfor %}
-                           </ul>
-                        </div>
-
-                   {% endif %}
-               {% endfor %}
-           {% endif %}
+        {% if options.data is iterable %}
+            {% for options in options.data %}
+                {% if options.items is defined and options.items is iterable %}
+                    <div class="nav-list" data-nav="{{ options.href }}">
+                        <h2 class="nav-item nav-item--header t-nav-header" id="aria-quaternary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">{{ options.label|raw }}</h2>
+
+                        <ul class="nav-items" aria-labelledby="aria-quaternary-nav-heading-{{ options.label|striptags|replace({' ': '-'})|raw }}">
+                            {% for menu_blocks in options.items %}
+                                {% for item_options in menu_blocks %}
+                                    {{ nav.nav_item(item_options, heading_id) }}
+                                {% endfor %}
+                                {% if not loop.last %}
+                                    <li class="nav-item nav-item__divider">
+                                        <hr class="nav-divider t-nav-divider" />
+                                    </li>
+                                {% endif %}
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
+            {% endfor %}
+        {% endif %}
     </div>
 </nav>