From ce5e5667f8e5d591afd6a700a1d0f8acbbfe99b5 Mon Sep 17 00:00:00 2001
From: "sws-developers@lists.stanford.edu" <CircleCI>
Date: Fri, 11 Jun 2021 18:01:25 +0000
Subject: [PATCH 1/4] Back to dev

---
 stanford_basic.info.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stanford_basic.info.yml b/stanford_basic.info.yml
index cc2d4c2d..c8a90c77 100755
--- a/stanford_basic.info.yml
+++ b/stanford_basic.info.yml
@@ -2,7 +2,7 @@ name: 'Stanford Basic'
 type: theme
 description: 'Stanford Basic Branding Theme.'
 package: Stanford
-version: 8.x-5.6
+version: 8.x-5.7-dev
 core_version_requirement: ^9
 'base theme': stable9
 regions:

From 2682a1853c0474b8bd361c6e0b6322458a705db8 Mon Sep 17 00:00:00 2001
From: pookmish <pookmish@stanford.edu>
Date: Tue, 6 Jul 2021 13:45:21 -0700
Subject: [PATCH 2/4] D8CORE-4496 Prevent empty <ul> elements in secondary nav
 (#233)

---
 .../menus/macros/secondary-nav-menu.twig      | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/templates/menus/macros/secondary-nav-menu.twig b/templates/menus/macros/secondary-nav-menu.twig
index 27ab9518..d03064c2 100644
--- a/templates/menus/macros/secondary-nav-menu.twig
+++ b/templates/menus/macros/secondary-nav-menu.twig
@@ -3,44 +3,50 @@
  * Macro for creating nested menus.
  */
 #}
+
 {% macro secondary_nav_menu(items, menu_level, class_prefix, parent) %}
   {% import _self as menus %}
-  <ul class="{{ class_prefix }}__menu {{ class_prefix }}__menu-lv{{ menu_level }}">
-  {% for item in items %}
 
-    {# Link Attribtues #}
-    {% set link_attributes = item.attributes %}
-    {% set link_attributes = link_attributes.addClass(class_prefix ~ "__link") %}
-    {% set link_attributes = link_attributes.setAttribute('href', item.url|render) %}
+  {% set items_to_display = items|filter(item => item.in_active_trail == true or menu_level == 1 or parent.in_active_trail == true) %}
+
+  {% if items_to_display is not empty %}
+    <ul class="{{ class_prefix }}__menu {{ class_prefix }}__menu-lv{{ menu_level }}">
+    {% for item in items_to_display %}
+
+      {# Link Attribtues #}
+      {% set link_attributes = item.attributes %}
+      {% set link_attributes = link_attributes.addClass(class_prefix ~ "__link") %}
+      {% set link_attributes = link_attributes.setAttribute('href', item.url|render) %}
 
-    {# Item Attributes #}
-    {% set list_attributes = create_attribute() %}
-    {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item") %}
-    {% if item.below is not empty %}
-      {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--parent") %}
-    {% endif %}
-    {% if item.in_active_trail == true %}
-      {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--active-trail") %}
-    {% endif %}
-    {% if item.is_active == true %}
-      {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--current") %}
-      {% set link_attributes = link_attributes.setAttribute('aria-current', 'true') %}
-    {% endif %}
+      {# Item Attributes #}
+      {% set list_attributes = create_attribute() %}
+      {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item") %}
+      {% if item.below is not empty %}
+        {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--parent") %}
+      {% endif %}
+      {% if item.in_active_trail == true %}
+        {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--active-trail") %}
+      {% endif %}
+      {% if item.is_active == true %}
+        {% set list_attributes = list_attributes.addClass(class_prefix ~ "__item--current") %}
+        {% set link_attributes = link_attributes.setAttribute('aria-current', 'true') %}
+      {% endif %}
 
-    {# Skip non-trail items below the first level. #}
-    {% if item.in_active_trail == true or menu_level == 1 or parent.in_active_trail == true %}
-      <li{{ list_attributes }}>
-        <a{{ link_attributes }}>
-          {{ item.title }}
-          {% if item.unpublished %}
-            <div class="unpublished-indicator">{{ "Unpublished Page"|t }}</div>
+      {# Skip non-trail items below the first level. #}
+      {% if item.in_active_trail == true or menu_level == 1 or parent.in_active_trail == true %}
+        <li{{ list_attributes }}>
+          <a{{ link_attributes }}>
+            {{ item.title }}
+            {% if item.unpublished %}
+              <div class="unpublished-indicator">{{ "Unpublished Page"|t }}</div>
+            {% endif %}
+          </a>
+          {% if item.below %}
+            {{ menus.secondary_nav_menu(item.below, menu_level + 1, class_prefix, item) }}
           {% endif %}
-        </a>
-        {% if item.below %}
-          {{ menus.secondary_nav_menu(item.below, menu_level + 1, class_prefix, item) }}
-        {% endif %}
-      </li>
-    {% endif %}
-  {% endfor %}
-  </ul>
+        </li>
+      {% endif %}
+    {% endfor %}
+    </ul>
+  {% endif %}
 {% endmacro %}

From 24e659cb45434b63c9ae09178af4664d3ad02e84 Mon Sep 17 00:00:00 2001
From: Jen Breese <jbreese@stanford.edu>
Date: Wed, 7 Jul 2021 11:08:09 -0700
Subject: [PATCH 3/4] D8CORE-4490: adding secondary skip links to secondary
 navigation (#232)

---
 dist/js/behaviors.js                               | 2 +-
 src/js/stanford_basic.behavior.js                  | 3 ++-
 templates/block/block--system-menu-block.html.twig | 2 ++
 templates/menus/menu--secondary-nav.html.twig      | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dist/js/behaviors.js b/dist/js/behaviors.js
index 77341ca5..322c49df 100644
--- a/dist/js/behaviors.js
+++ b/dist/js/behaviors.js
@@ -1,2 +1,2 @@
-!function(n){var o={};function a(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,a),e.l=!0,e.exports}a.m=n,a.c=o,a.d=function(t,e,n){a.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},a.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(a.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)a.d(n,o,function(t){return e[t]}.bind(null,o));return n},a.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return a.d(e,"a",e),e},a.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},a.p="",a(a.s=329)}({318:function(t,e){var n,o=document.getElementById("block-stanford-basic-local-tasks");o&&(n=o.getBoundingClientRect().top,window.onscroll=function(){!function(){var t=0;t=!0===document.body.classList.contains("toolbar-tray-open")?79:39;window.pageYOffset>=n-t?(o.classList.add("sticky"),o.style.marginTop=t+"px"):(o.classList.remove("sticky"),o.style.marginTop="0px")}()})},319:function(t,e){window.Drupal.behaviors.stanford_basic={attach:function(n){!function(o){o("#main-content",n).length||o(".su-skipnav--content",n).attr("href","#page-content"),o("#secondary-navigation",n).length||o(".su-skipnav--secondary",n).remove();var a,t=o(".su-masthead .su-site-search",n);function e(){o(window).scrollTop()>=3*o(window).height()?o("#back-to-top").fadeIn():o("#back-to-top").fadeOut()}t.length&&((a=t.clone()).addClass("search-block-form"),a.attr("id","block-stanford-basic-search-mobile"),a.find("[id]").each(function(t,e){var n=o(e).attr("id");a.find('[for="'.concat(n,'"]')).attr("for","".concat(n,"-mobile")),o(e).attr("id","".concat(n,"-mobile"))}),a.prependTo(".su-masthead .su-multi-menu > ul",n).wrap('<li class="su-mobile-site-search"></li>')),o("#block-stanford-basic-local-tasks",n).length&&o(".page-content",n).addClass("stanford-basic--outline"),o(".page-user-login",n)&&o(".su-back-to-site",n).removeClass("hidden"),e(),o(window).scroll(e),o("#back-to-top",n).once("back-to-top").click(function(t){t.preventDefault(),o("html, body").animate({scrollTop:0},"slow"),o("#page-content").attr("tabIndex","-1").focus()})}(jQuery)},detach:function(){}}},329:function(t,e,n){"use strict";n.r(e);n(318),n(319)}});
+!function(n){var o={};function a(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,a),e.l=!0,e.exports}a.m=n,a.c=o,a.d=function(t,e,n){a.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},a.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(a.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)a.d(n,o,function(t){return e[t]}.bind(null,o));return n},a.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return a.d(e,"a",e),e},a.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},a.p="",a(a.s=329)}({318:function(t,e){var n,o=document.getElementById("block-stanford-basic-local-tasks");o&&(n=o.getBoundingClientRect().top,window.onscroll=function(){!function(){var t=0;t=!0===document.body.classList.contains("toolbar-tray-open")?79:39;window.pageYOffset>=n-t?(o.classList.add("sticky"),o.style.marginTop=t+"px"):(o.classList.remove("sticky"),o.style.marginTop="0px")}()})},319:function(t,e){window.Drupal.behaviors.stanford_basic={attach:function(c){!function(o){o("#main-content",c).length||o(".su-skipnav--content",c).attr("href","#page-content");var t=o("#secondary-navigation",c).length,e=o(".menu--stanford-publication-topics",c).length;t||e||o(".su-skipnav--secondary",c).remove();var a,n=o(".su-masthead .su-site-search",c);function r(){o(window).scrollTop()>=3*o(window).height()?o("#back-to-top").fadeIn():o("#back-to-top").fadeOut()}n.length&&((a=n.clone()).addClass("search-block-form"),a.attr("id","block-stanford-basic-search-mobile"),a.find("[id]").each(function(t,e){var n=o(e).attr("id");a.find('[for="'.concat(n,'"]')).attr("for","".concat(n,"-mobile")),o(e).attr("id","".concat(n,"-mobile"))}),a.prependTo(".su-masthead .su-multi-menu > ul",c).wrap('<li class="su-mobile-site-search"></li>')),o("#block-stanford-basic-local-tasks",c).length&&o(".page-content",c).addClass("stanford-basic--outline"),o(".page-user-login",c)&&o(".su-back-to-site",c).removeClass("hidden"),r(),o(window).scroll(r),o("#back-to-top",c).once("back-to-top").click(function(t){t.preventDefault(),o("html, body").animate({scrollTop:0},"slow"),o("#page-content").attr("tabIndex","-1").focus()})}(jQuery)},detach:function(){}}},329:function(t,e,n){"use strict";n.r(e);n(318),n(319)}});
 //# sourceMappingURL=behaviors.js.map
\ No newline at end of file
diff --git a/src/js/stanford_basic.behavior.js b/src/js/stanford_basic.behavior.js
index 9085c216..31bebdb7 100644
--- a/src/js/stanford_basic.behavior.js
+++ b/src/js/stanford_basic.behavior.js
@@ -22,7 +22,8 @@ export default {
       // Validate there is a skip link for the secondary navigation. If not,
       // remove the skip link. If the mobile hamburger is visible, remove the link.
       var $sn = $('#secondary-navigation', context).length;
-      if (!$sn) {
+      var $pn = $('.menu--stanford-publication-topics', context).length;
+      if (!$sn && !$pn) {
         $('.su-skipnav--secondary', context).remove();
       }
 
diff --git a/templates/block/block--system-menu-block.html.twig b/templates/block/block--system-menu-block.html.twig
index 03613ed7..cf642216 100755
--- a/templates/block/block--system-menu-block.html.twig
+++ b/templates/block/block--system-menu-block.html.twig
@@ -40,7 +40,9 @@
   ]
 %}
 {% set heading_id = (configuration.id ~ '-menu')|clean_id %}
+<a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip to main content'|t }}</a>
 <div {{ attributes.addClass(classes) }}>
+  <div id="secondary-navigation" tabindex="-1" class="visually-hidden focusable">{{ 'Secondary Navigation'|t }}</div>
   {# Label. If not displayed, we still provide it for screen readers. #}
   {% if not configuration.label_display %}
     {% set title_attributes = title_attributes.addClass('visually-hidden') %}
diff --git a/templates/menus/menu--secondary-nav.html.twig b/templates/menus/menu--secondary-nav.html.twig
index 350afec4..63cef907 100644
--- a/templates/menus/menu--secondary-nav.html.twig
+++ b/templates/menus/menu--secondary-nav.html.twig
@@ -20,7 +20,7 @@
 {%- import "@basic/menus/macros/secondary-nav-menu.twig" as menus -%}
 <a href="#main-content" class="visually-hidden focusable su-skipnav su-skipnav--content">{{ 'Skip to main content'|t }}</a>
 <nav{{ attributes }}>
-  <a name="secondary-navigation" id="secondary-navigation" tabindex="-1" class="visually-hidden focusable">{{ 'Secondary Navigation'|t }}</a>
+  <div id="secondary-navigation" tabindex="-1" class="visually-hidden focusable">{{ 'Secondary Navigation'|t }}</div>
   {% spaceless %}
   {% if items is iterable %}
     {{ menus.secondary_nav_menu(items, 1, 'su-secondary-nav') }}

From 1e24a5cb2b60aead4e8c0d90129995b12bcc80b9 Mon Sep 17 00:00:00 2001
From: Ian Monroe <ian@ianmonroe.com>
Date: Fri, 9 Jul 2021 10:45:20 -0600
Subject: [PATCH 4/4] 8.5.7

---
 CHANGELOG.md            | 7 +++++++
 stanford_basic.info.yml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 158c8b0c..2db826bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Stanford Basic Theme
 
+8.x-5.7
+--------------------------------------------------------------------------------
+_Release Date: 2021-07-09_
+
+- D8CORE-4490: adding secondary skip links to secondary navigation (#232) (24e659c)
+- D8CORE-4496 Prevent empty <ul> elements in secondary nav (#233) (2682a18)
+
 8.x-5.6
 --------------------------------------------------------------------------------
 _Release Date: 2021-06-11_
diff --git a/stanford_basic.info.yml b/stanford_basic.info.yml
index c8a90c77..6412beea 100755
--- a/stanford_basic.info.yml
+++ b/stanford_basic.info.yml
@@ -2,7 +2,7 @@ name: 'Stanford Basic'
 type: theme
 description: 'Stanford Basic Branding Theme.'
 package: Stanford
-version: 8.x-5.7-dev
+version: 8.x-5.7
 core_version_requirement: ^9
 'base theme': stable9
 regions: