chore: align styles

This commit is contained in:
Arvid Norlin
2024-04-30 10:48:11 +02:00
parent a43dc8a16f
commit a1e474073e
10 changed files with 42 additions and 35 deletions

View File

@@ -74,8 +74,8 @@ export default function Content({ lang, content }: ContentProps) {
return ( return (
<Shortcuts <Shortcuts
shortcuts={shortcuts} shortcuts={shortcuts}
subtitle={item.preamble} subtitle={item.shortcuts.preamble}
title={item.title} title={item.shortcuts.title}
/> />
) )
case ContentEntries.AccountPageContentTextContent: case ContentEntries.AccountPageContentTextContent:

View File

@@ -19,7 +19,13 @@ export default async function CurrentBenefitsBlock({
<section className={styles.container}> <section className={styles.container}>
<header className={styles.header}> <header className={styles.header}>
{title && ( {title && (
<Title as="h3" level="h2" className={styles.title} uppercase> <Title
as="h3"
level="h2"
weight={"medium"}
className={styles.title}
uppercase
>
{title} {title}
</Title> </Title>
)} )}

View File

@@ -21,7 +21,13 @@ export default async function NextLevelBenefitsBlock({
<section className={styles.container}> <section className={styles.container}>
<header className={styles.header}> <header className={styles.header}>
{title && ( {title && (
<Title as="h3" level="h2" uppercase className={styles.title}> <Title
as="h3"
level="h2"
uppercase
weight="medium"
className={styles.title}
>
{title} {title}
</Title> </Title>
)} )}

View File

@@ -1,11 +1,7 @@
.container { .container {
background-color: var(--some-grey-color, #f2f2f2); background-color: var(--some-grey-color, #f2f2f2);
display: grid; display: grid;
gap: 0.8rem; gap: 1.5rem;
}
.title {
font-weight: 600;
} }
.overview { .overview {

View File

@@ -15,7 +15,13 @@ export default function Shortcuts({
return ( return (
<section className={styles.shortcuts}> <section className={styles.shortcuts}>
<header className={styles.header}> <header className={styles.header}>
<Title level="h2" as="h5" uppercase> <Title
as="h3"
level="h2"
weight={"medium"}
className={styles.title}
uppercase
>
{title} {title}
</Title> </Title>
<p className={styles.subtitle}>{subtitle}</p> <p className={styles.subtitle}>{subtitle}</p>

View File

@@ -1,12 +1,14 @@
.header { .header {
display: grid; display: grid;
grid-template-areas: "title link"; grid-template-areas:
"title link"
"subtitle subtitle";
grid-template-columns: 1fr max-content; grid-template-columns: 1fr max-content;
gap: 1.5rem;
} }
.title { .title {
grid-area: title; grid-area: title;
font-weight: 600;
} }
.link { .link {
@@ -14,15 +16,5 @@
} }
.subtitle { .subtitle {
padding-top: 0.5rem; grid-area: subtitle;
padding-bottom: 2.5rem;
margin: 0;
}
@media screen and (min-width: 950px) {
.subtitle {
width: 60%;
padding-top: 2.5rem;
padding-bottom: 5rem;
}
} }

View File

@@ -15,7 +15,7 @@ export default function Header({ title, subtitle, link }: HeaderProps) {
as="h3" as="h3"
level="h2" level="h2"
className={styles.title} className={styles.title}
weight="semiBold" weight="medium"
uppercase uppercase
> >
{title} {title}
@@ -26,12 +26,12 @@ export default function Header({ title, subtitle, link }: HeaderProps) {
{link.text} {link.text}
</Link> </Link>
)} )}
{subtitle && (
<Title as="h5" weight="regular" className={styles.subtitle}>
{subtitle}
</Title>
)}
</header> </header>
{subtitle && (
<Title as="h5" weight="regular" className={styles.subtitle}>
{subtitle}
</Title>
)}
</> </>
) )
} }

View File

@@ -1,5 +1,7 @@
import { serverClient } from "@/lib/trpc/server" import { serverClient } from "@/lib/trpc/server"
import MaxWidth from "@/components/MaxWidth"
import Header from "../Header" import Header from "../Header"
import StayList from "../StayList" import StayList from "../StayList"
import EmptyUpcomingStaysBlock from "./EmptyUpcomingStays" import EmptyUpcomingStaysBlock from "./EmptyUpcomingStays"
@@ -17,13 +19,13 @@ export default async function SoonestStays({
const stays = await serverClient().user.stays.soonestUpcoming() const stays = await serverClient().user.stays.soonestUpcoming()
return ( return (
<section className={styles.container}> <MaxWidth className={styles.container} tag="section">
<Header title={title} subtitle={subtitle} link={link} /> <Header title={title} subtitle={subtitle} link={link} />
{stays.length ? ( {stays.length ? (
<StayList lang={lang} stays={stays} /> <StayList lang={lang} stays={stays} />
) : ( ) : (
<EmptyUpcomingStaysBlock /> <EmptyUpcomingStaysBlock />
)} )}
</section> </MaxWidth>
) )
} }

View File

@@ -1,3 +1,4 @@
.container { .container {
max-width: var(--max-width); display: grid;
gap: 1.5rem;
} }

View File

@@ -41,9 +41,7 @@ type AccountPageDynamicContent = Typename<
type AccountPageContentShortcuts = Typename< type AccountPageContentShortcuts = Typename<
{ {
title?: string shortcuts: { title?: string; preamble?: string; shortcuts: Shortcut[] }
preamble?: string
shortcuts: { shortcuts: Shortcut[] }
}, },
ContentEntries.AccountPageContentShortcuts ContentEntries.AccountPageContentShortcuts
> >