Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions blocks/banner/banner.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}

.banner-heading {
max-width: 500px;
max-width: 60%;
padding-top: 0;
margin-top: var(--spacing-l);
}
Expand Down Expand Up @@ -140,13 +140,13 @@
flex-direction: column;
position: relative;
max-width: 1100px;
padding-left: 92px;
justify-content: center;
min-height: 400px;
}

.banner-heading {
max-width: 500px;
margin-top: 0;
padding: var(--spacing-s) var(--spacing-xxl);
}

.banner-heading h2 {
Expand Down
2 changes: 1 addition & 1 deletion blocks/cards-icon/_cards-icon.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"page": {
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "cards-icon",
"name": "Cards Icon",
"model": "cards-icon",
"filter": "cards-icon"
}
Expand Down
76 changes: 13 additions & 63 deletions blocks/cards-icon/cards-icon.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
================================================================= */

.cards-icon .cards-icon-grid {
margin: 0;
padding: 0;
padding: var(--spacing-xs) 0;
}

.cards-icon .cards-icon-card-link {
Expand All @@ -19,13 +18,11 @@

.cards-icon .cards-icon-image {
line-height: 0;
flex-shrink: 0;
height: 70px;
}

.cards-icon .cards-icon-image img {
object-fit: contain;
border-radius: 0;
aspect-ratio: 1/1;
}

.cards-icon .cards-icon-body h3 {
Expand Down Expand Up @@ -86,12 +83,13 @@
min-width: 0;
}

.cards-icon.image-left a h3 {
.cards-icon.image-left .cards-icon-card-link {
color: var(--color-purple-800);
text-decoration: none;
}

.dark-scheme .cards-icon.image-left a.cards-icon-link {
.dark-scheme .cards-icon.image-left .cards-icon-card-link,
.dark-scheme .cards-icon.image-top .cards-icon-card-link {
color: var(--color-white);
}

Expand All @@ -101,16 +99,13 @@
================================================================= */

.cards-icon.image-top {
margin: var(--spacing-s) 0;
min-height: 175px;
}

.cards-icon.image-top .cards-icon-grid {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 16px;
padding: 0;
margin-bottom: var(--spacing-m);
gap: var(--spacing-xxs) 16px;
}

.cards-icon.image-top .cards-icon-card {
Expand All @@ -123,8 +118,7 @@
border: 1px var(--text-color) solid;
border-radius: 12px;
width: 100%;
gap: 10px;
min-height: 140px;
min-height: 146px;
justify-content: flex-start;
position: relative;
box-sizing: border-box;
Expand All @@ -135,13 +129,6 @@
display: flex;
justify-content: center;
align-items: center;
margin-bottom: 4px;
}

.cards-icon.image-top .cards-icon-image img {
width: 64px;
height: 64px;
object-fit: contain;
}

.cards-icon.image-top .cards-icon-body {
Expand Down Expand Up @@ -182,7 +169,7 @@
flex-direction: row;
align-items: center;
height: 90px;
padding: 0 16px;
padding: 0 20px;
margin-bottom: var(--spacing-s);
background: var(--color-white);
border-radius: 12px;
Expand All @@ -196,19 +183,11 @@

.cards-icon.image-left-arrow .cards-icon-image {
flex-shrink: 0;
width: 70px;
display: flex;
align-items: center;
justify-content: center;
}

.cards-icon.image-left-arrow .cards-icon-image img {
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 4px;
}

.cards-icon.image-left-arrow .cards-icon-body {
flex: 1;
margin: 0;
Expand Down Expand Up @@ -258,10 +237,6 @@
transform: translateY(-2px);
}

/* =================================================================
TABLET (600px+)
================================================================= */

@media (width >= 600px) {
.cards-icon.image-left .cards-icon-card {
flex-direction: row;
Expand All @@ -270,26 +245,15 @@
}

/* Important Documents: tighter grid, constrained width */
.cards-icon.image-top .cards-icon-grid {
gap: var(--spacing-xs) var(--spacing-s);
max-width: 80%;
margin-left: auto;
margin-right: auto;
}

.cards-icon.image-top .cards-icon-card {
padding: 20px var(--spacing-xs);
gap: 6px;
}

.cards-icon.image-top .cards-icon-image {
margin-bottom: 3px;
}

.cards-icon.image-top .cards-icon-image img {
width: 56px;
height: 56px;
}
.cards-icon.image-top .cards-icon-grid {
gap: var(--spacing-xxs) var(--spacing-s);
}

/* Related Search: 2-column grid */
.cards-icon.image-left-arrow .cards-icon-grid {
Expand All @@ -300,11 +264,6 @@
.cards-icon.image-left-arrow .cards-icon-card {
margin-bottom: 0;
}

.cards-icon.image-left-arrow .cards-icon-image {
width: 80px;
height: 70px;
}
}

@media (width >= 900px) {
Expand All @@ -321,21 +280,13 @@
.cards-icon.image-top .cards-icon-grid {
grid-template-columns: repeat(4, 175px);
grid-auto-rows: 175px;
max-width: 900px;
justify-content: space-between;
margin-left: auto;
margin-right: auto;
justify-content: space-evenly;
}

.cards-icon.image-top .cards-icon-card {
width: 175px;
height: 175px;
padding: var(--spacing-s) 26px;
}

.cards-icon.image-top .cards-icon-image img {
width: 64px;
height: 64px;
padding: var(--spacing-s);
}

.cards-icon.image-top .cards-icon-body {
Expand All @@ -356,6 +307,5 @@
grid-template-columns: repeat(3, 1fr);
gap: 20px;
max-width: 1120px;
margin: 0 auto;
}
}
2 changes: 1 addition & 1 deletion blocks/cards-icon/cards-icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function decorate(block) {
}
});
outer.querySelectorAll('picture > img').forEach((img) => {
const optimizedPic = createOptimizedPicture(img.src, img.alt, false, [{ width: '400' }]);
const optimizedPic = createOptimizedPicture(img.src, img.alt, false, [{ width: '750' }]);
moveInstrumentation(img, optimizedPic.querySelector('img'));
img.closest('picture').replaceWith(optimizedPic);
});
Expand Down
4 changes: 4 additions & 0 deletions blocks/cards/cards.css
Original file line number Diff line number Diff line change
Expand Up @@ -2008,4 +2008,8 @@
justify-content: center;
}

.explore-other-cards .swiper-slide .cards-card-body h3 {
font-size: var(--heading-font-size-xs);
color: var(--color-gray-200);
}
}
4 changes: 4 additions & 0 deletions blocks/footer/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,10 @@ footer .footer>div .section>div {
}

@media (width >= 768px) {
.footer > div > div {
padding: 0 36px;
}

.footer>div>div:nth-child(2)>div>ul>li:nth-child(2) {
text-align: center;
}
Expand Down
2 changes: 1 addition & 1 deletion component-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
"page": {
"resourceType": "core/franklin/components/block/v1/block",
"template": {
"name": "cards-icon",
"name": "Cards Icon",
"model": "cards-icon",
"filter": "cards-icon"
}
Expand Down
Loading