fix: tweak css

This commit is contained in:
Arvid Norlin
2024-05-28 11:43:14 +02:00
parent 4b4e214ab9
commit f68b184d93
4 changed files with 16 additions and 29 deletions

View File

@@ -11,7 +11,7 @@ export default async function LoyaltyPage() {
const hasSidebar = !!loyaltyPage.sidebar.length const hasSidebar = !!loyaltyPage.sidebar.length
return ( return (
<section <section
className={`${styles.content} ${hasSidebar && styles.hasLeftSignbar}`} className={`${styles.content} ${hasSidebar && styles.hasLeftSidebar}`}
> >
{hasSidebar && <Sidebar blocks={loyaltyPage.sidebar} />} {hasSidebar && <Sidebar blocks={loyaltyPage.sidebar} />}

View File

@@ -13,7 +13,7 @@
} }
@media screen and (min-width: 950px) { @media screen and (min-width: 950px) {
.withLeftSidebar { .hasLeftSidebar {
grid-template-columns: 30rem 1fr; grid-template-columns: 30rem 1fr;
} }
@@ -29,6 +29,9 @@
gap: 6.4rem; gap: 6.4rem;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
}
.hasLeftSidebar .blocks {
grid-column: 2 / -1; grid-column: 2 / -1;
} }
} }

View File

@@ -1,14 +1,12 @@
.container { .container {
background-color: var(--Main-Brand-PalePeach); background-color: var(--Main-Brand-PalePeach);
left: 50%;
margin-top: calc(var(--Spacing-x2) * -1); margin-top: calc(var(--Spacing-x2) * -1);
margin-left: -50vw; margin-left: calc(var(--Spacing-x2) * -1);
margin-right: -50vw; margin-right: calc(var(--Spacing-x2) * -1);
margin-bottom: calc( margin-bottom: calc(
(var(--Spacing-x2) + 7.7rem) * -1 (var(--Spacing-x2) + 7.7rem) * -1
); /* Based on the MaxWidth's 1.6rem + the LoyaltyPage's 7.7rem bottom margins */ ); /* Based on the MaxWidth's 1.6rem + the LoyaltyPage's 7.7rem bottom margins */
position: relative; position: relative;
right: 50%;
width: 100dvw; width: 100dvw;
padding: var(--Spacing-x2); padding: var(--Spacing-x2);
display: grid; display: grid;
@@ -39,7 +37,6 @@
.mobileColumns { .mobileColumns {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
/* gap: var(--Spacing-x2); */
display: none; display: none;
margin: 0 calc(var(--Spacing-x2) * -1); margin: 0 calc(var(--Spacing-x2) * -1);
position: relative; position: relative;
@@ -121,7 +118,6 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 50%; right: 50%;
margin-left: calc(var(--Spacing-x2) * -1);
z-index: 1; z-index: 1;
} }
@@ -134,23 +130,10 @@
margin-bottom: calc(var(--Spacing-x2) * -1); margin-bottom: calc(var(--Spacing-x2) * -1);
left: 50%; left: 50%;
right: 0; right: 0;
margin-right: calc(var(--Spacing-x2) * -1);
z-index: 1; z-index: 1;
border-top-left-radius: var(--Corner-radius-Medium); border-top-left-radius: var(--Corner-radius-Medium);
} }
.thirdColumn {
width: calc(100% / 3);
background-color: var(--Main-Brand-PalePeach);
position: absolute;
top: 0;
bottom: 0;
left: calc(100% / 3 * 2);
right: 0;
margin-left: calc(var(--Spacing-x2) * -1);
z-index: 1;
}
.levelSummary { .levelSummary {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -256,15 +239,8 @@
@media screen and (min-width: 950px) { @media screen and (min-width: 950px) {
.container { .container {
left: auto; margin: 0 calc(var(--Spacing-x3) * -1);
right: auto;
margin-top: 0;
margin-bottom: 0;
margin-left: 0;
margin-right: 0;
width: auto;
} }
.mobileColumns { .mobileColumns {
display: none; display: none;
} }

View File

@@ -1,6 +1,7 @@
.container { .container {
display: grid; display: grid;
gap: 2.4rem; gap: 2.4rem;
/* These negative margins are needed for horizontally scrollable lists of cards */
margin-right: -1.6rem; margin-right: -1.6rem;
padding-right: 1.6rem; padding-right: 1.6rem;
} }
@@ -26,3 +27,10 @@
margin: 0; margin: 0;
grid-area: subtitle; grid-area: subtitle;
} }
@media screen and (min-width: 950px) {
.container {
margin-right: 0;
margin-left: 0;
}
}