Skip to content

Commit

Permalink
Merge pull request #52 from adobecom/gnav
Browse files Browse the repository at this point in the history
Adds initial Gnav (gnav will change again soon when it's definitely authored)
  • Loading branch information
vhargrave authored Sep 11, 2024
2 parents 1df3531 + 6f0e4e9 commit 1d6d4d6
Show file tree
Hide file tree
Showing 11 changed files with 855 additions and 973 deletions.
4 changes: 4 additions & 0 deletions express/blocks/blog-posts/blog-posts.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ main .section:has(.blog-posts-wrapper) > .content:first-child, main .section > .
padding-top: 60px
}

main .section:has(.blog-posts-wrapper) div > h3:first-child {
margin-top: 0px
}

.blog main .section:has(.blog-posts-wrapper) > div > h2, main .section:has(.blog-posts) div.blog-posts-decoration {
max-width: 280px;
}
Expand Down
9 changes: 7 additions & 2 deletions express/blocks/faq/faq.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

.section:has(.faq) > div {
margin: auto;
padding: 0 24px;
padding-top: 0;
padding-right: 24px;
padding-left: 24px;
max-width: 375px;
}

Expand All @@ -23,6 +25,7 @@

.faq {
text-align: left;
padding-bottom: 80px;
}

.faq .faq-accordion {
Expand Down Expand Up @@ -71,7 +74,9 @@

@media (min-width: 900px) {
.section:has(.faq) > div {
padding: 0 56px;
padding-top: 0;
padding-right: 56px;
padding-left: 56px;
max-width: 830px;
}

Expand Down
7 changes: 7 additions & 0 deletions express/blocks/fullscreen-marquee/fullscreen-marquee.css
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,13 @@
padding-right: 10px;
}

/* disable budoux on small screens */
@media (max-width: 600px) {
h1.budoux {
word-break: normal;
}
}

@media (min-width: 900px) {
.section > .fullscreen-marquee {
padding-bottom: 40px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
margin-bottom: 0;
}

.how-to-steps-carousel .tip-text h3 {
main .how-to-steps-carousel .tip-text h3 {
margin-bottom: 16px;
font-size: var(--heading-font-size-m);
text-align: left;
Expand Down
4 changes: 2 additions & 2 deletions express/blocks/promotion/promotion.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
margin: var(--spacing-xxxl) auto;
}

.promotion[data-block-status="loaded"] {
display: block;
.promotion h2, .promotion h3{
text-align: center;
}

.promotion .promotion-wrapper {
Expand Down
4 changes: 4 additions & 0 deletions express/blocks/template-x/template-x.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ main.with-holiday-templates-banner > div[class='section section-wrapper template
width: 100%;
}

.template-title {
text-align: center;
}

[data-block-name="template-x"] {
margin: 0 auto;
}
Expand Down
11 changes: 11 additions & 0 deletions express/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,17 @@ function decorateHeroLCP(loadStyle, config, createTag, getMetadata) {
createTag,
} = await import(`${miloLibs}/utils/utils.js`);

// TODO remove metadata after we go live
const gnav = createTag('meta', { name: 'gnav-source', content: '/express/localnav-express' });
document.head.append(gnav);

const footer = createTag('meta', { name: 'footer', content: 'global-footer' });
document.head.append(footer);

const footerSrc = createTag('meta', { name: 'footer-source', content: '/federal/footer/footer' });
document.head.append(footerSrc);
// end TODO remove metadata after we go live

const jarvisVisibleMeta = getMetadata('jarvis-immediately-visible')?.toLowerCase();
const desktopViewport = window.matchMedia('(min-width: 900px)').matches;
if (jarvisVisibleMeta && ['mobile', 'desktop', 'on'].includes(jarvisVisibleMeta) && (
Expand Down
Loading

0 comments on commit 1d6d4d6

Please sign in to comment.