Merge branch 'main' into Update-Community-Links-Events

GSA · Jul 16, 2024 · 20493c5 · 20493c5
2 parents 4f0ca82 + 6439f46
commit 20493c5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/themes/digital.gov/layouts/_default/baseof.html b/themes/digital.gov/layouts/_default/baseof.html
@@ -17,7 +17,7 @@
     {{- "<!-- Google Tag Manager (noscript) -->" | safeHTML -}}
     <noscript
       ><iframe
-        src="https://www.googletagmanager.com/ns.html?id=G-HBYXWFP794"
+        src="https://www.googletagmanager.com/ns.html?id=GTM-MZCKZPQ"
         height="0"
         width="0"
         style="display:none;visibility:hidden"

diff --git a/themes/digital.gov/layouts/partials/core/head.html b/themes/digital.gov/layouts/partials/core/head.html
@@ -72,7 +72,7 @@
       j.async = true;
       j.src = "https://www.googletagmanager.com/gtm.js?id=" + i + dl;
       f.parentNode.insertBefore(j, f);
-    })(window, document, "script", "dataLayer", "G-HBYXWFP794");
+    })(window, document, "script", "dataLayer", "GTM-MZCKZPQ");
   </script>
 
   {{ "<!-- End Google Tag Manager -->" | safeHTML }}

diff --git a/themes/digital.gov/src/js/in-page-navigation.js b/themes/digital.gov/src/js/in-page-navigation.js
@@ -1,3 +1,6 @@
+// Only show the in-page navigation when 3 or more nav items are present on the page
+// Only display h2's as the primary nav items and set h3 and h4 sub-items to display: none
+
 document.addEventListener("DOMContentLoaded", () => {
   const relatedItems = document.querySelector("[data-related-items]");
   const inPageNav = document.querySelector(".usa-in-page-nav__nav");
@@ -17,4 +20,15 @@ document.addEventListener("DOMContentLoaded", () => {
 
   inPageNavHeader.removeAttribute("tabindex");
   relatedItems.before(inPageNav);
+
+  // Hide nav links when they are a child of a ring component
+  navItems.forEach((item) => {
+    const targetId = item.querySelector("a").getAttribute("href").slice(1);
+    const targetElement = document.getElementById(targetId);
+
+    if (targetElement && targetElement.closest(".dg-ring")) {
+      const newItem = item;
+      newItem.style.display = "none";
+    }
+  });
 });
diff --git a/themes/digital.gov/src/scss/new/shortcodes/_ring.scss b/themes/digital.gov/src/scss/new/shortcodes/_ring.scss
@@ -10,7 +10,7 @@
   position: relative;
 
   &__title {
-    $font-size: units(3);
+    $font-size: units(4);
 
     background: color("white");
     font-size: $font-size;
@@ -23,6 +23,7 @@
 
   h2 {
     @include u-font("sans", "lg");
+    font-size: size("sans", 11);
     font-weight: font-weight("semibold");
   }
 }