Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Release] Stage to Main" #3496

Closed
wants to merge 1 commit into from
Closed

Revert "[Release] Stage to Main" #3496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. Make sure that a `main` branch exists in your forked repository.
1. Install the [AEM Code Sync](https://github.com/apps/aem-code-sync) on your forked repo.
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.
Expand Down
1 change: 0 additions & 1 deletion libs/blocks/fallback/fallback.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const SYNTHETIC_BLOCKS = [
'search',
'social',
'product-entry-cta',
'gnav-image',
];

// eslint-disable-next-line import/prefer-default-export
Expand Down
9 changes: 0 additions & 9 deletions libs/blocks/global-navigation/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@
--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 */
Expand Down
42 changes: 0 additions & 42 deletions libs/blocks/global-navigation/dark-nav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
--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,
Expand Down Expand Up @@ -88,44 +84,6 @@
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;
Expand Down
3 changes: 1 addition & 2 deletions libs/blocks/global-navigation/features/aside/aside.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ 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, fedsPromoWrapper, promoPath } = {}) {
export default async function decorateAside({ headerElem, promoPath } = {}) {
const onError = () => {
fedsPromoWrapper?.remove();
headerElem?.classList.remove('has-promo');
lanaLog({ message: 'Gnav Promo fragment not replaced, potential CLS' });
return '';
Expand Down
Loading
Loading