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

USF-1990 Update home page design with relevant content and images #310

Merged
merged 7 commits into from
Feb 10, 2025
Merged

USF-1990 Update home page design with relevant content and images #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b820ce
Update home page design with relevant content and images
OscarMerino Feb 7, 2025
ad49ca2
Upload condensed adobe-clean font
OscarMerino Feb 7, 2025
067b59f
Merge branch 'main' into USF-1990
sirugh Feb 7, 2025
ab36e7a
Hide empty div sections and set proper strong font
OscarMerino Feb 10, 2025
9e31129
Merge branch 'USF-1990' of github.com:hlxsites/aem-boilerplate-commer…
OscarMerino Feb 10, 2025
26f3706
Update background-color to use SDK tokens
OscarMerino Feb 10, 2025
0c2722e
Merge branch 'main' into USF-1990
OscarMerino Feb 10, 2025
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
15 changes: 12 additions & 3 deletions blocks/cards/cards.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
.cards-container .cards-wrapper {
margin-top: var(--spacing-xbig);
}

.cards-card-body strong {
font: var(--type-condensed-font-family);
font-weight: bolder;
}

.cards > ul {
list-style: none;
margin: 0;
padding: 0;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(257px, 1fr));
grid-gap: 24px;
grid-gap: var(--spacing-medium);
}

.cards > ul > li {
border: 1px solid var(--color-neutral-500);
border: var(--shape-border-width-1) solid var(--color-neutral-500);
background-color: var(--background-color);
}

.cards .cards-card-body {
margin: 16px;
margin: var(--spacing-small);
}

.cards .cards-card-image {
Expand Down
2 changes: 1 addition & 1 deletion blocks/hero/hero.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
.hero {
padding: 40px 32px;
}
}
}
Binary file added fonts/AdobeClean-BoldCond.otf
View file
Open in desktop
Binary file not shown.
Binary file added fonts/AdobeClean-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file added fonts/AdobeClean-Regular.otf
View file
Open in desktop
Binary file not shown.
27 changes: 27 additions & 0 deletions styles/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
/* stylelint-disable max-line-length */
@font-face {
font-family: adobe-clean;
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/AdobeClean-Light.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: adobe-clean;
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('../fonts/AdobeClean-Regular.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: adobe-clean-condensed;
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/AdobeClean-BoldCond.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: roboto-condensed;
font-style: normal;
Expand Down
41 changes: 30 additions & 11 deletions styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
--spacing-huge: 120px;
--spacing-xhuge: 144px;
--spacing-xxhuge: 192px;
--type-base-font-family: roboto, roboto-fallback;
--type-condensed-font-family: roboto-condensed, roboto-condensed-fallback, sans-serif;
--type-base-font-family: adobe-clean, roboto, roboto-fallback;
--type-condensed-font-family: adobe-clean-condensed, roboto-condensed, roboto-condensed-fallback, sans-serif;
--type-display-1-font: normal normal 300 6.0rem/7.2rem var(--type-base-font-family);
--type-display-1-letter-spacing: 0.04em;
--type-display-2-font: normal normal 300 4.8rem/5.6rem
Expand Down Expand Up @@ -141,23 +141,38 @@
--type-details-overline-letter-spacing: 0.16em;

/* Additional tokens */
--type-fixed-font-family: 'Roboto Mono', menlo, consolas, 'Liberation Mono',
--type-fixed-font-family: adobe-clean, 'Roboto Mono', menlo, consolas, 'Liberation Mono',
monospace;
--background-color: var(--color-neutral-50);
--nav-height: 6.4rem;
}

/* fallback fonts */
@font-face {
font-family: roboto-condensed-fallback;
size-adjust: 88.82%;
src: local('Arial');
font-family: adobe-clean;
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/AdobeClean-Light.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: roboto-fallback;
size-adjust: 99.529%;
src: local('Arial');
font-family: adobe-clean;
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('../fonts/AdobeClean-Regular.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

@font-face {
font-family: adobe-clean-condensed;
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/AdobeClean-BoldCond.otf') format('opentype');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

html, body {
Expand All @@ -172,7 +187,7 @@ body {
font: var(--type-body-1-default-font);
letter-spacing: var(--type-body-1-default-letter-spacing);
margin: 0;
color: var(--color-brand-700);
color: var(--color-neutral-800);
background-color: var(--background-color);
display: grid;
grid-template-rows: auto 1fr auto;
Expand Down Expand Up @@ -404,6 +419,10 @@ main > .section {
margin: var(--spacing-xbig) 0;
}

.section:empty {
display: none;
}

main > .section > div {
max-width: 1200px;
margin: auto;
Expand All @@ -423,7 +442,7 @@ main > .section:first-of-type {
/* section metadata */
main .section.light,
main .section.highlight {
background-color: var(--color-neutral-500);
background-color: var(--color-neutral-100);
margin: 0;
padding: var(--spacing-xbig) 0;
}
Expand Down