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

[Release] Stage to Main #2811 #72

Merged
merged 21 commits into from
Sep 3, 2024
Merged

[Release] Stage to Main #2811 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6362c19
[MWPW-155566] [MEP] Allow relevant actions in MEP to use text and HTM…
denlight Sep 2, 2024
42d51a0
MWPW-156793 [MILO][Analytics] Change char limit for headers based on …
markpadbe Sep 2, 2024
8467b03
MWPW-157540: fix external modals (#2806)
3ch023 Sep 2, 2024
d405ac1
Mwpw 142267: What's included style fixes (#2674)
Axelcureno Sep 2, 2024
1c4001b
MWPW-156810: adding caas config change for live CTAs (#2707)
sheridansunier Sep 2, 2024
5417762
MWPW-156672: refactor commerce & optimize pandora dependencies (#2723)
3ch023 Sep 2, 2024
3551ffd
MWPW-154209 - [hero-marquee] bugs (#2727)
ryanmparrish Sep 2, 2024
10cfc4b
Dark nav for standalone Gnav (#2730)
nishantka Sep 2, 2024
ad50e4b
MWPW-157034 [MEP] move call for preview from loadPostLCP to loadDefer…
vgoodric Sep 2, 2024
77268c0
[MWPW-152968] mWeb - Passing ECID to Branch.io banner - Implementatio…
drashti1712 Sep 2, 2024
4e85f88
MWPW-153372 - Add ability to further customize buttons (#2776)
elan-tbx Sep 2, 2024
e675bf4
MWPW-156126 - quiz-entry contrast and accessibility (#2785)
colloyd Sep 2, 2024
76a1344
MWPW-157346:[NALA] Move Nala tests to Milo repository (#2795)
skumar09 Sep 2, 2024
fc58707
[MWPW-157556] Eagerly import lit from merch-card block (#2809)
seanchoi-dev Sep 2, 2024
582c244
MWPW-157005 Marketo thank you fixes (#2779)
Brandon32 Sep 2, 2024
3331e11
[MWPW-148140] Adjust table strikethrough pricing (#2786)
overmyheadandbody Sep 2, 2024
3ad052c
Parallelize Placeholder loading for an LCP improvement (#2752)
mokimo Sep 2, 2024
8b62e93
MWPW-151932 - Section metadata style grid enhancement for tablet VP (…
ryanmparrish Sep 2, 2024
bc61484
MWPW-154448: Content should be in a data table but is not (#2667)
sivasadobe Sep 3, 2024
47dea19
MWPW-156866 [MILO][MEP] Create martech metadata table if placeholders…
AdobeLinhart Sep 3, 2024
7216452
MWPW-157445 Additional Lana LCP data (#2805)
chrischrischris Sep 3, 2024
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ logs/*
.iml
.env
**/mas/*/stats.json
test-html-results/
test-results/
1 change: 1 addition & 0 deletions libs/blocks/caas-config/caas-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ const UiPanel = () => html`
<${Input} label="Show total card count at top" prop="showTotalResults" type="checkbox" />
<${Input} label="Hide date for on-demand content" prop="hideDateInterval" type="checkbox" />
<${Input} label="Enable showing card badges (by default hidden)" prop="showCardBadges" type="checkbox" />
<${Input} label="Show a different CTA for live events" prop="dynamicCTAForLiveEvents" type="checkbox" />
<${Select} label="Card Style" prop="cardStyle" options=${defaultOptions.cardStyle} />
<${Select} options=${defaultOptions.cardTitleAccessibilityLevel} prop="cardTitleAccessibilityLevel" label="Card Accessibility Title Level" />
<${Select} label="Layout" prop="container" options=${defaultOptions.container} />
Expand Down
2 changes: 2 additions & 0 deletions libs/blocks/caas/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ export const getConfig = async (originalState, strs = {}) => {
},
detailsTextOption: state.detailsTextOption,
hideDateInterval: state.hideDateInterval,
dynamicCTAForLiveEvents: state.dynamicCTAForLiveEvents,
setCardBorders: state.setCardBorders,
showFooterDivider: state.showFooterDivider,
useOverlayLinks: state.useOverlayLinks,
Expand Down Expand Up @@ -764,6 +765,7 @@ export const initCaas = async (state, caasStrs, el) => {

export const defaultState = {
additionalRequestParams: [],
dynamicCTAForLiveEvents: false,
analyticsCollectionName: '',
analyticsTrackImpression: false,
andLogicTags: [],
Expand Down
3 changes: 1 addition & 2 deletions libs/blocks/chart/chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { loadScript, getConfig, createTag } from '../../utils/utils.js';
import { loadScript, getConfig, createTag, customFetch } from '../../utils/utils.js';
import {
throttle,
parseValue,
Expand Down Expand Up @@ -122,7 +122,6 @@ export function processMarkData(series, xUnit) {
}

export async function fetchData(link) {
const { customFetch } = await import('../../utils/helpers.js');
const resp = await customFetch({ resource: link.href.toLowerCase(), withCacheRules: true })
.catch(() => ({}));

Expand Down
3 changes: 1 addition & 2 deletions libs/blocks/fragment/fragment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable max-classes-per-file */
import { createTag, getConfig, loadArea, localizeLink } from '../../utils/utils.js';
import { createTag, getConfig, loadArea, localizeLink, customFetch } from '../../utils/utils.js';

const fragMap = {};

Expand Down Expand Up @@ -83,7 +83,6 @@ export default async function init(a) {
return;
}

const { customFetch } = await import('../../utils/helpers.js');
let resourcePath = a.href;
if (a.href.includes('/federal/')) {
const { getFederatedUrl } = await import('../../utils/federated.js');
Expand Down
34 changes: 17 additions & 17 deletions libs/blocks/global-footer/global-footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
display: flex;
justify-content: center;
font-size: 12px;
background: var(--feds-background-footer--light);
background: var(--feds-background-footer);
}

.global-footer ul {
Expand All @@ -26,7 +26,7 @@
display: flex;
flex-direction: column;
row-gap: 30px;
color: var(--feds-color-headline--light);
color: var(--feds-color-headline);
}

.feds-footer-wrapper ul {
Expand Down Expand Up @@ -65,7 +65,7 @@
margin: 0 var(--feds-gutter-footer);
border-width: 1px 0 1px 0;
border-style: solid;
border-color: var(--feds-borderColor-featuredProducts--light);
border-color: var(--feds-borderColor-featuredProducts);
}

.feds-featuredProducts-label {
Expand Down Expand Up @@ -99,15 +99,15 @@
/* Region picker */
.feds-regionPicker {
column-gap: 10px;
color: var(--feds-color-link--light);
border-color: var(--feds-color-link--light);
fill: var(--feds-color-link--light);
color: var(--feds-color-link);
border-color: var(--feds-color-link);
fill: var(--feds-color-link);
}

.feds-regionPicker:hover {
color: var(--feds-color-link--hover--light);
border-color: var(--feds-color-link--hover--light);
fill: var(--feds-color-link--hover--light);
color: var(--feds-color-link--hover);
border-color: var(--feds-color-link--hover);
fill: var(--feds-color-link--hover);
}

.feds-regionPicker:after {
Expand Down Expand Up @@ -145,8 +145,8 @@
min-width: 130px;
max-height: 300px;
overflow-y: auto;
background: var(--feds-background-nav--light);
border: 1px solid var(--feds-color-border--light);
background: var(--feds-background-nav);
border: 1px solid var(--feds-borderColor);
border-radius: 4px;
}

Expand Down Expand Up @@ -186,11 +186,11 @@
padding: 0 20px;
display: block;
line-height: 2;
color: var(--feds-color-link--hover--light);
color: var(--feds-color-link--hover);
}

.feds-regionPicker-wrapper > .fragment a:hover {
background: var(--feds-background-link--hover--light);
background: var(--feds-background-link--hover);
}

/* Social */
Expand Down Expand Up @@ -234,13 +234,13 @@
display: flex;
column-gap: 5px;
align-items: center;
color: var(--feds-color-link--light);
fill: var(--feds-color-link--light);
color: var(--feds-color-link);
fill: var(--feds-color-link);
}

.feds-footer-privacyLink:hover {
color: var(--feds-color-link--hover--light);
fill: var(--feds-color-link--hover--light);
color: var(--feds-color-link--hover);
fill: var(--feds-color-link--hover);
}

.feds-adChoices-icon {
Expand Down
2 changes: 2 additions & 0 deletions libs/blocks/global-footer/global-footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
logErrorFor,
toFragment,
federatePictureSources,
isDarkMode,
} from '../global-navigation/utilities/utilities.js';

import { getFederatedUrl } from '../../utils/federated.js';
Expand Down Expand Up @@ -370,6 +371,7 @@ class Footer {
export default function init(block) {
try {
const footer = new Footer({ block });
if (isDarkMode()) block.classList.add('feds--dark');
return footer;
} catch (e) {
lanaLog({ message: 'Could not create footer', e });
Expand Down
51 changes: 28 additions & 23 deletions libs/blocks/global-navigation/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,31 @@
--feds-height-breadcrumbs: 33px;
--feds-gutter: 8px;
/* Top navigation - backgrounds */
--feds-background-nav--light: #fff;
--feds-background-popup--light: #fafafa;
--feds-background-nav: #fff;
--feds-background-popup: #fafafa;
--feds-background-promo--dark: #000;
/* Top navigation - borders */
--feds-borderColor--light: #eaeaea;
--feds-borderColor-menu--light: #e1e1e1;
--feds-borderColor: #eaeaea;
--feds-borderColor-menu: #e1e1e1;
--feds-borderColor-navLink: #2c2c2c;
/* Top navigation - colors */
--feds-color-adobeBrand: #EB1000;
--feds-color-headline--light: #505050;
--feds-color-headline: #505050;
--feds-color-hamburger: #2d2d2d;
--feds-color-breadcrumbs--current: #2c2c2c;
--feds-color-signIn: #4B4B4B;
/* Top navigation - misc */
--feds-radius-utilityIcon: 4px;
/* Links */
--feds-background-link--hover--light: #f5f5f5;
--feds-borderColor-link--light: #f3f3f3;
--feds-color-link--light: #2c2c2c;
--feds-color-link--hover--light: #1473e6;
--feds-color-navLink-description--light: #656565;
--feds-background-link--hover: #f5f5f5;
--feds-borderColor-link: #f3f3f3;
--feds-color-link: #2c2c2c;
--feds-color-link--hover: #1473e6;
--feds-color-navLink-description: #656565;
--feds-color-link-breadcrumbs: #707070;
/* Footer */
--feds-background-footer--light: #fafafa;
--feds-borderColor-featuredProducts--light: #999;
--feds-background-footer: #fafafa;
--feds-borderColor-featuredProducts: #999;
--feds-gutter-footer: 32px;
}

Expand All @@ -36,23 +41,23 @@
align-items: center;
padding: 12px;
border: none;
color: var(--feds-color-link--light);
color: var(--feds-color-link);
font: inherit;
white-space: nowrap;
flex-shrink: 0;
}

.feds-navLink:hover,
.feds-navLink:focus {
color: var(--feds-color-link--hover--light);
color: var(--feds-color-link--hover);
}

.feds-navLink:not(.feds-navLink--hoverCaret) {
column-gap: 15px;
}

.feds-navLink--blue {
color: var(--feds-color-link--hover--light);
color: var(--feds-color-link--hover);
}

.feds-navLink--hoverCaret {
Expand All @@ -62,15 +67,15 @@

.feds-navLink--hoverCaret:hover,
.feds-navLink--hoverCaret:focus {
color: var(--feds-color-link--light);
color: var(--feds-color-link);
}

.feds-navLink--hoverCaret:after,
.feds-navLink[class *= '-gradient'] .feds-navLink-title:after {
display: flex;
border-width: 0 1px 1px 0;
border-style: solid;
border-color: var(--feds-color-link--light);
border-color: var(--feds-color-link);
transform-origin: 75% 75%;
transition: transform 0.1s ease;
box-sizing: content-box;
Expand Down Expand Up @@ -134,15 +139,15 @@ header.global-navigation {

.feds-navItem--active > .feds-navLink:only-child:hover,
.feds-navItem--active > .feds-navLink:only-child:focus {
color: var(--feds-color-link--light);
color: var(--feds-color-link);
}

.feds-navItem--active > .feds-navLink:before {
position: absolute;
bottom: 0;
left: 0;
right: 0;
border-bottom: 2px solid #2c2c2c;
border-bottom: 2px solid var(--feds-borderColor-navLink);
content: "";
}

Expand Down Expand Up @@ -172,7 +177,7 @@ header.global-navigation {

.feds-navLink--hoverCaret:hover,
.feds-navLink--hoverCaret:focus {
background-color: var(--feds-background-popup--light);
background-color: var(--feds-background-popup);
}

.feds-navLink--hoverCaret:after {
Expand Down Expand Up @@ -214,12 +219,12 @@ header.global-navigation {
.feds-navLink-description {
display: flex;
font-size: 12px;
color: var(--feds-color-navLink-description--light);
color: var(--feds-color-navLink-description);
}

.feds-navLink:hover .feds-navLink-description,
.feds-navLink:focus .feds-navLink-description {
color: var(--feds-color-navLink-description--light);
color: var(--feds-color-navLink-description);
}

/* Nav Link special styles for A/B test */
Expand Down Expand Up @@ -260,7 +265,7 @@ header.global-navigation {

.feds-navLink[class *= '-gradient']:hover .feds-navLink-title:after,
.feds-navLink[class *= '-gradient']:focus .feds-navLink-title:after {
border-color: var(--feds-color-link--hover--light);
border-color: var(--feds-color-link--hover);
}

.feds-navLink--photo-gradient {
Expand Down
Loading
Loading