Merge branch 'MWPW-164093' into MWPW-169143

adobecom · Mar 5, 2025 · 25b55a0 · 25b55a0
2 parents 1e5ab05 + 751309a
commit 25b55a0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/libs/blocks/global-navigation/global-navigation.css b/libs/blocks/global-navigation/global-navigation.css
@@ -34,6 +34,7 @@ header.global-navigation {
   z-index: 10;
   background-color: var(--feds-background-nav);
   box-sizing: content-box;
+  overflow-x: clip;
 }
 
 .feds-topnav-wrapper {
@@ -513,10 +514,6 @@ header.global-navigation {
 
 /* Desktop styles */
 @media (min-width: 900px) {
-  header.global-navigation {
-    contain: layout;
-  }
-
   /* General */
   .global-navigation.has-breadcrumbs {
     padding-bottom: var(--feds-height-breadcrumbs);

diff --git a/libs/deps/mas/mas.js b/libs/deps/mas/mas.js
diff --git a/libs/deps/mas/merch-card.js b/libs/deps/mas/merch-card.js
diff --git a/libs/features/mas/dist/mas.js b/libs/features/mas/dist/mas.js
diff --git a/libs/features/mas/src/hydrate.js b/libs/features/mas/src/hydrate.js
@@ -278,6 +278,9 @@ function createSpectrumCssButton(cta, aemFragmentMapping, isOutline, variant) {
 function createSpectrumSwcButton(cta, aemFragmentMapping, isOutline, variant) {
     const CheckoutButton = customElements.get('checkout-button');
     const checkoutButton = CheckoutButton.createCheckoutButton(cta.dataset);
+    if (cta.dataset.analyticsId) {
+        checkoutButton.setAttribute('data-analytics-id', cta.dataset.analyticsId);
+    }
     checkoutButton.connectedCallback();
     checkoutButton.render();