diff --git a/web/src/components/events/EventItem.tsx b/web/src/components/events/EventItem.tsx index f150d05..026932e 100644 --- a/web/src/components/events/EventItem.tsx +++ b/web/src/components/events/EventItem.tsx @@ -40,38 +40,43 @@ export const EventItem = ({ /> )} -
-

{event.title}

+
{mode === "list" && nextOccurrence && ( -
+
{numOccurrences === 1 && nextOccurrence?.start && formatDate(nextOccurrence.start, commonDateTimeFormat)} {numOccurrences > 1 && nextOccurrence?.start && ( -
+ <> {formatDate(nextOccurrence.start, commonDateTimeFormat)} -

Flere datoer ({numOccurrences}) →

-
+

+ Flere datoer ({numOccurrences}) +

+ )}
)} {mode === "singular" && "occurrence" in event && event.occurrence?.start && ( -

+

{formatDate(event.occurrence?.start, commonDateTimeFormat)}

)} {mode === "calendar" && "occurrence" in event && event.occurrence?.start && ( -

+

{formatDate(event.occurrence?.start, "'kl.' HH:mm")}

)}
+
+

{event.title}

+

Evt. andre detaljer

+
Mer om arrangementet {event.title} diff --git a/web/src/components/events/eventItem.module.scss b/web/src/components/events/eventItem.module.scss index 9c64292..2544140 100644 --- a/web/src/components/events/eventItem.module.scss +++ b/web/src/components/events/eventItem.module.scss @@ -1,6 +1,8 @@ .eventItem { position: relative; list-style: none; + display: grid; + align-items: flex-start; &.small { @@ -12,19 +14,59 @@ &.medium { --size-image-width: 8rem; - display: grid; + grid-template-rows: 1fr 2fr; grid-template-columns: var(--size-image-width) auto; column-gap: .6rem; align-items: center; width: var(--size-item-width); + .image { + width: var(--size-image-width); + grid-row: span 2; + } + + .dates, .title, .details { font-size: var(--font-size-body); } + .dates { + font-size: var(--font-size-caption); + } + + .text { + align-self: start; + } + + .time { + align-self: start; + } + + .dates { + margin: auto 0 0 0; + } + + .details { + display: none; + } + } + + &.large { + align-content: start; + + .time { + order: 1; + + } + .image { - width: var(--size-image-width); + order: 2; + margin-bottom: var(--spacing-xs); + } + + .text { + order: 3; } } } @@ -43,15 +85,38 @@ } } -.text { - padding: .8rem 0; +.title { + font-size: var(--font-size-h2); } -.title, .details { - font-size: 1.6rem; + font-size: var(--font-size-lead); } +.dates, .details { font-family: var(--font-serif); +} + + +.time { + position: relative; +} + +.dates { + font-size: var(--font-size-body); + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} + +.moreDates { + display: inline-block; + background: var(--color-background-secondary); + color: var(--color-chateauBlue); + border-radius: 2rem; + padding: 0 .4rem; + font-size: var(--font-size-xs); + font-family: var(--font-main); } \ No newline at end of file diff --git a/web/src/css/variables.scss b/web/src/css/variables.scss index 35752ce..f05ac86 100644 --- a/web/src/css/variables.scss +++ b/web/src/css/variables.scss @@ -10,6 +10,7 @@ --font-main-bold-italic: 'AvenirNextBoldItalic', 'Avenir Next', 'Avenir', sans-serif; --font-serif: 'p22-mackinac-pro', serif; + --font-size-xs: .66rem; --font-size-caption: .8rem; --font-size-body: 1rem; --font-size-lead: 1.4rem;