Skip to content

[Release] Stage to Main #6325

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

Merged
milo-pr-merge merged 3 commits into from
Jul 22, 2026
Merged

[Release] Stage to Main #6325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0314d74
Promo flicker fix by resizing lenis after Gnav loads (#6233)
bandana147 Jul 21, 2026
26d712f
MWPW-199601: Bc marquee (#6276)
JasonHowellSlavin Jul 21, 2026
e19dd67
MWPW-199473 Fix dynamic-nav status bar RTL layout (#6311)
JasonHowellSlavin Jul 21, 2026
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
280 changes: 278 additions & 2 deletions libs/blocks/brand-concierge/brand-concierge.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,12 +659,15 @@
opacity: 0.4;
}

.floating-input .bc-floating-input .bc-textarea-grow-wrap {
.floating-input .bc-floating-input .bc-textarea-grow-wrap,
.brand-concierge.marquee .bc-textarea-grow-wrap {
overflow: hidden;
}

.floating-input .bc-floating-input .bc-input-field-container textarea,
.floating-input .bc-floating-input .bc-textarea-grow-wrap::after {
.floating-input .bc-floating-input .bc-textarea-grow-wrap::after,
.brand-concierge.marquee .bc-input-field-container textarea,
.brand-concierge.marquee .bc-textarea-grow-wrap::after {
max-height: 48px;
min-height: 48px;
overflow: hidden;
Expand Down Expand Up @@ -1198,3 +1201,276 @@
max-width: 80vw;
}
}

/* marquee */
/* stylelint-disable no-descending-specificity */
.brand-concierge.marquee {
position: relative;
overflow: hidden;
isolation: isolate;
display: flex;
flex-direction: column;
min-height: 560px;
padding: 0;
}

.brand-concierge.marquee .background {
position: absolute;
inset: 0;
z-index: -2;
}

.brand-concierge.marquee .background > div {
position: absolute;
inset: 0;
}

.brand-concierge.marquee .background picture {
display: block;
position: absolute;
inset: 0;
width: 100%;
height: 100%;
}

.brand-concierge.marquee .background img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
object-position: 65%;
}

.brand-concierge.marquee .background::after {
content: '';
position: absolute;
inset: 0;
z-index: 1;
}

.brand-concierge.marquee.dark .background::after {
background: linear-gradient(270deg, rgba(0 0 0 / 0%) -100%, #000 100%);
}

.brand-concierge.marquee.light .background::after {
background: linear-gradient(270deg, rgba(255 255 255 / 0%) 0%, #FFF 100%);
}

.brand-concierge.marquee .background .tablet-only,
.brand-concierge.marquee .background .desktop-only {
display: none;
}

.brand-concierge.marquee .background .mobile-only {
display: block;
}

.brand-concierge.marquee .foreground.container {
position: relative;
z-index: 1;
flex: 1 0 auto;
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 16px;
padding: 64px 0 30px;
}

.brand-concierge.marquee .bc-header,
.brand-concierge.marquee .bc-input-field,
.brand-concierge.marquee .bc-prompt-cards,
.brand-concierge.marquee .bc-legal {
width: 100%;
max-width: 540px;
margin: 0;
text-align: left;
align-items: flex-start;
}

.brand-concierge.marquee .bc-header {
gap: 8px;
margin-bottom: 8px;
padding: 0;
}

.brand-concierge.marquee .bc-header-eyebrow {
margin: 0;
font-size: 16px;
font-weight: 700;
line-height: 1.25;
letter-spacing: 0.04em;
text-transform: uppercase;
}

.brand-concierge.marquee .bc-header-title {
margin: 0;
font-size: 36px;
font-weight: 800;
line-height: 1.25;
}

.brand-concierge.marquee .bc-header-subtitle {
margin: 0;
font-size: 18px;
font-weight: 400;
line-height: 1.5;
}

.brand-concierge.marquee.dark .bc-header {
color: var(--bc-dark-text-color);
}

.brand-concierge.marquee .bc-input-field {
margin: 16px 0 0;
max-width: 480px;
}

.brand-concierge.marquee .bc-input-field-container {
margin-bottom: 0;
}

.brand-concierge.marquee .bc-prompt-cards {
flex-flow: column nowrap;
gap: 12px;
padding: 8px 0 64px;
}

.brand-concierge.marquee .prompt-card-button {
width: fit-content;
max-width: 100%;
border-radius: 24px;
}

.brand-concierge.marquee .prompt-card-text {
grid-template-columns: auto;
padding: 6px 16px;
}

.brand-concierge.marquee .card-icon {
display: none;
}

.brand-concierge.marquee.dark .prompt-card-button {
background: rgba(0 0 0 / 48%);
}

.brand-concierge.marquee.light .prompt-card-button,
.brand-concierge.marquee.dark .prompt-card-button {
border-color: #8f8f8f;
}

.brand-concierge.marquee.dark .prompt-card-button:hover {
background: rgba(255 255 255 / 18%);
border-color: rgba(255 255 255 / 40%);
}

.brand-concierge.marquee.dark .prompt-card-text,
.brand-concierge.marquee.dark .prompt-card-text p {
color: var(--bc-dark-text-color);
}

.brand-concierge.marquee .bc-legal {
margin: auto 0 0;
max-width: 540px;
}

.brand-concierge.marquee.dark .bc-legal,
.brand-concierge.marquee.dark .bc-legal a {
color: rgba(255 255 255 / 80%);
}

@media screen and (min-width: 600px) {
.brand-concierge.marquee {
min-height: 540px;
}

.brand-concierge.marquee .foreground.container {
padding: 56px 0;
}

.brand-concierge.marquee .background .mobile-only,
.brand-concierge.marquee .background .desktop-only {
display: none;
}

.brand-concierge.marquee .background .tablet-only {
display: block;
}

.brand-concierge.marquee .bc-header,
.brand-concierge.marquee .bc-input-field,
.brand-concierge.marquee .bc-prompt-cards,
.brand-concierge.marquee .bc-legal {
max-width: 600px;
}
}

@media screen and (min-width: 768px) {
.brand-concierge.marquee .foreground.container {
padding: 72px 0;
}

.brand-concierge.marquee .bc-header-title,
.brand-concierge.marquee .bc-header-subtitle {
max-width: 545px;
}

.brand-concierge.marquee .bc-input-field {
max-width: 100%;
}
}

@media screen and (min-width: 1200px) {
.brand-concierge.marquee {
min-height: 700px;
}

.brand-concierge.marquee .foreground.container {
padding: 120px 0 64px;
}

.brand-concierge.marquee .background .mobile-only,
.brand-concierge.marquee .background .tablet-only {
display: none;
}

.brand-concierge.marquee .background .desktop-only {
display: block;
}

.brand-concierge.marquee .foreground .bc-header,
.brand-concierge.marquee .foreground .bc-input-field,
.brand-concierge.marquee .foreground .bc-prompt-cards,
.brand-concierge.marquee .foreground .bc-legal {
max-width: 705px;
}

.brand-concierge.marquee .bc-header-title {
font-size: 80px;
line-height: 1.1;
}

.brand-concierge.marquee .bc-header-subtitle {
margin-top: 4px;
font-size: 20px;
}

.brand-concierge.marquee .bc-prompt-cards {
margin: 8px 0 56px;
}

.brand-concierge.marquee.dark .background::after {
background: linear-gradient(270deg, rgba(0 0 0 / 0%) -0.39%, #000 100%);
}

.brand-concierge.marquee.light .background::after {
background: linear-gradient(270deg, rgba(255 255 255 / 0%) -0.39%, #FFF 100%);
}

.brand-concierge.marquee .bc-header-title,
.brand-concierge.marquee .bc-header-subtitle {
max-width: 100%;
}
}

/* stylelint-enable no-descending-specificity */
69 changes: 61 additions & 8 deletions libs/blocks/brand-concierge/brand-concierge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,50 @@ function decorateBackground(el, background) {
if (el.contains(background)) el.removeChild(background);
}

function decorateHeader(el, header) {
const hTag = header.querySelector('h1, h2, h3, h4, h5, h6');
const subTitle = header.querySelector('p');
function decorateMarqueeBackground(el, background) {
const pictures = [...background.querySelectorAll('picture')];
if (!pictures.length) {
decorateBackground(el, background);
return;
}
const backgroundLayer = createTag('div', { class: 'background' });
if (pictures.length === 1) {
backgroundLayer.append(pictures[0]);
} else {
const viewports = ['desktop-only', 'tablet-only', 'mobile-only'];
pictures.forEach((picture, index) => {
backgroundLayer.append(createTag('div', { class: viewports[index] || 'mobile-only' }, picture));
});
}
el.prepend(backgroundLayer);
if (el.contains(background)) el.removeChild(background);
}

function decorateHeader(el, header, { eyebrow: withEyebrow = false } = {}) {
const headerSection = createTag('section', { class: 'bc-header' });
let title;
let eyebrow = null;

if (withEyebrow) {
[eyebrow, title] = header.querySelectorAll('h1, h2, h3, h4, h5, h6');
} else {
title = header.querySelector('h1, h2, h3, h4, h5, h6');
}
const subTitle = header.querySelector('p');

if (hTag) {
hTag.classList.add('bc-header-title');
headerSection.append(hTag);
if (eyebrow) {
eyebrow.classList.add('bc-header-eyebrow');
headerSection.append(eyebrow);
}
if (title) {
title.classList.add('bc-header-title');
headerSection.append(title);
}
if (subTitle) {
subTitle.classList.add('bc-header-subtitle');
headerSection.append(subTitle);
}
if (!hTag && !subTitle) {
if (!eyebrow && !title && !subTitle) {
headerSection.append(createTag('p', { class: 'bc-header-subtitle' }, header.textContent.trim()));
}

Expand Down Expand Up @@ -683,6 +713,9 @@ function handleConsent(el) {
}

export default async function init(el) {
// Reset variant flags so each block decorates independently of any prior init.
Object.keys(variants).forEach((key) => delete variants[key]);

handleConsent(el);
window.addEventListener('adobePrivacy:PrivacyReject', () => handleConsent(el));
window.addEventListener('adobePrivacy:PrivacyCustom', () => handleConsent(el));
Expand All @@ -697,7 +730,9 @@ export default async function init(el) {
setAuthoredContent(rows);

// set variant
if (!el.classList.contains('hero')
if (el.classList.contains('marquee')) {
variants.isMarquee = true;
} else if (!el.classList.contains('hero')
&& !el.classList.contains('floating-button-only')
&& !el.classList.contains('floating-input-only')) {
el.classList.add('inline');
Expand Down Expand Up @@ -773,6 +808,24 @@ export default async function init(el) {
decorateLegal(el, legal);
}

if (variants.isMarquee) {
const [background, header, cards, input, legal] = rows;
decorateMarqueeBackground(el, background);
decorateHeader(el, header, { eyebrow: true });
decorateInput(el, input);
decorateCards(el, cards);
decorateLegal(el, legal);

const foreground = createTag('div', { class: 'foreground container' });
foreground.append(
el.querySelector('.bc-header'),
el.querySelector('.bc-input-field'),
el.querySelector('.bc-prompt-cards'),
el.querySelector('.bc-legal'),
);
el.append(foreground);
}

if (variants.isFloatingInput) {
const [, , cards, input] = rows;
decorateFloatingInput(el, cards, input);
Expand Down
Loading
Loading