[Release] Stage to Main (#3487)

adobecom · Jan 16, 2025 · 409ed68 · 409ed68
2 parents a61dc66 + b1351a6
commit 409ed68
Show file tree

Hide file tree

Showing 55 changed files with 3,830 additions and 384 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Milo is a shared set of features and services to power Franklin-based websites o
 
 ### Detailed
 1. Fork this repo.
-1. Install the [AEM Code Sync](https://github.com/apps/aem-code-sync) on your forked repo.
+1. Install the [AEM Code Sync](https://github.com/apps/aem-code-sync) on your forked repo. Make sure that a `main` branch exists in your forked repository.  
 1. Clone your forked repo down to your computer.
 1. Install the [AEM CLI](https://github.com/adobe/helix-cli) using your terminal: `sudo npm install -g @adobe/aem-cli`
 1. In a terminal, run `aem up` your repo's folder on your computer. It will open a browser.

diff --git a/libs/blocks/fallback/fallback.js b/libs/blocks/fallback/fallback.js
@@ -18,6 +18,7 @@ const SYNTHETIC_BLOCKS = [
   'search',
   'social',
   'product-entry-cta',
+  'gnav-image',
 ];
 
 // eslint-disable-next-line import/prefer-default-export

diff --git a/libs/blocks/global-navigation/base.css b/libs/blocks/global-navigation/base.css
@@ -35,6 +35,15 @@
   --feds-background-footer: #fafafa;
   --feds-borderColor-featuredProducts: #999;
   --feds-gutter-footer: 32px;
+
+  /* mobile gnav redesign */
+  --feds-color-white-v2: #fff;
+  --feds-color-black-v2: #000;
+  --feds-background-cloudmenu-v2: #111;
+  --feds-borderColor-link-v2: #eaeaea;
+  --feds-backgroundColor-tabs-v2: #f8f8f8;
+  --feds-backgroundColor-tabContent-v2: #f3f3f3;
+  --feds-borderColor-localnav-v2: #eee;
 }
 
 /* Nav Link styles */

diff --git a/libs/blocks/global-navigation/dark-nav.css b/libs/blocks/global-navigation/dark-nav.css
@@ -40,6 +40,10 @@
   --feds-color-profile--dark: #dbdbdb;
   --feds-color-profile--emphasis--dark: #f2f2f2;
   --feds-border-profile--dark: 1px solid var(--feds-borderColor);
+
+  /* mobile gnav redesign */
+  --feds-borderColor-link-v2: #323232;
+  --feds-borderColor-localnav-v2: #323232;
 }
 
 .feds--dark .feds-navLink--hoverCaret:hover,
@@ -84,6 +88,44 @@
   color: var(--feds-color-link--dark);
 }
 
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .top-bar {
+  background-color: var(--feds-background-nav--desktop);
+  border-bottom: 1px solid var(--feds-background-nav--desktop);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .title {
+  background-color: var(--background-color);
+  border-bottom: 1px solid var(--feds-borderColor-link-v2);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .tabs {
+  background-color: var(--background-color);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .tab-content {
+  background-color: var(--background-color);
+  border-left: 1px solid var(--feds-borderColor-link-v2);
+}
+
+[dir = "rtl"] header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .tab-content {
+  border-left: none;
+  border-right: 1px solid var(--feds-borderColor-link-v2);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .tabs button[aria-selected="true"] {
+  color: var(--background-color);
+  background-color: var(--feds-borderColor-navLink);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .sticky-cta {
+  background-color: var(--background-color);
+  border-top: 1px solid var(--feds-borderColor-link-v2);
+}
+
+header.new-nav.feds--dark .feds-nav > section.feds-navItem > .feds-popup .top-bar .main-menu {
+  color: var(--text-color);
+}
+
 /* Popup */
 .feds--dark .feds-popup {
   background-color: #151515;

diff --git a/libs/blocks/global-navigation/features/aside/aside.js b/libs/blocks/global-navigation/features/aside/aside.js
@@ -2,8 +2,9 @@ import { loadBlock, decorateAutoBlock } from '../../../../utils/utils.js';
 import { toFragment, lanaLog } from '../../utilities/utilities.js';
 import { processTrackingLabels } from '../../../../martech/attributes.js';
 
-export default async function decorateAside({ headerElem, promoPath } = {}) {
+export default async function decorateAside({ headerElem, fedsPromoWrapper, promoPath } = {}) {
   const onError = () => {
+    fedsPromoWrapper?.remove();
     headerElem?.classList.remove('has-promo');
     lanaLog({ message: 'Gnav Promo fragment not replaced, potential CLS' });
     return '';