From 4a7f76e5f961fa17c97762e0adafcc3c0373553d Mon Sep 17 00:00:00 2001 From: elisejakob Date: Thu, 23 May 2024 11:55:36 +0200 Subject: [PATCH] add more practical info content, opening hours + some association sketching --- web/src/app/praktisk/page.tsx | 95 ++++++++++++++++++- .../associations/associationItem.module.scss | 26 +++-- .../associations/associationList.module.scss | 2 +- web/src/components/layout/Footer.tsx | 24 +++-- web/src/components/layout/footer.module.scss | 6 +- web/src/css/base.scss | 70 +++++++++++++- 6 files changed, 197 insertions(+), 26 deletions(-) diff --git a/web/src/app/praktisk/page.tsx b/web/src/app/praktisk/page.tsx index c4cb61c..3ce62ca 100644 --- a/web/src/app/praktisk/page.tsx +++ b/web/src/app/praktisk/page.tsx @@ -19,17 +19,17 @@ export default async function Page() { Hopp til: +
+

Adresse og adkomst

+
+

Adresse

+

+ Chateau Neuf +
+ Slemdalsveien +
+ 15 0369 Oslo +

+ Åpne i Google Maps → +
+ +
+
+
+

Adkomst

+

Skal vi si noe kort om hvordan du enklest kommer deg til Neuf?

+

Kollektivt

+

Parkering

+
+
+
+

Åpningstider

+
+

Serveringssteder

+
+

Glassbaren (1. etasje)

+ + + + + + + + + + + + + +
Man—Tor15:00—00:30
Fre15:00—02:30
Lør—SønÅpent ved arrangement
+
+
+

Bokcaféen (2. etasje)

+ + + + + + + + + +
Tir—Tor19:00—23:30
Fre19:00—01:30
+
+
+
+

Ekspedisjonen

+
+

Slottsmester og telefon

+ + + + + + + + + +
Man—Fre15:00—00:00
Lør14:00—00:00
+

Ekspedisjonen er også åpen under arrangementer på huset.

+ Se kontaktinfo til ekspedisjonen → +
+
+
+
+

Billetter

+
); diff --git a/web/src/components/associations/associationItem.module.scss b/web/src/components/associations/associationItem.module.scss index cec3881..921591c 100644 --- a/web/src/components/associations/associationItem.module.scss +++ b/web/src/components/associations/associationItem.module.scss @@ -1,12 +1,18 @@ -.venueItem { +.associationItem { position: relative; list-style: none; + display: grid; + grid-template-columns: 1fr 2fr; + align-items: flex-start; + gap: 1rem; + background: var(--color-white); + color: var(--color-black); + padding: 1rem; } .image { width: 100%; - padding-top: 60%; - background: var(--color-placeholder); + padding-top: 100%; position: relative; img { @@ -14,19 +20,21 @@ top: 0; width: 100%; height: 100%; - object-fit: cover; + object-fit: contain; } } .text { - padding: .8rem 0; + padding: 0; } -.excerpt {} +.title { + font-size: 1.2rem; + margin-bottom: 1rem; +} -.title, -.details { - font-size: 1.6rem; +.excerpt { + font-size: var(--font-size-caption); } .details { diff --git a/web/src/components/associations/associationList.module.scss b/web/src/components/associations/associationList.module.scss index 9fc378a..1bbe930 100644 --- a/web/src/components/associations/associationList.module.scss +++ b/web/src/components/associations/associationList.module.scss @@ -1,6 +1,6 @@ .associationList { display: grid; - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(3, 1fr); column-gap: var(--spacing-gap-column); row-gap: var(--spacing-gap-row); padding-bottom: var(--spacing-section-bottom); diff --git a/web/src/components/layout/Footer.tsx b/web/src/components/layout/Footer.tsx index afe23d0..b4f7e2c 100644 --- a/web/src/components/layout/Footer.tsx +++ b/web/src/components/layout/Footer.tsx @@ -62,14 +62,22 @@ export const Footer = () => {

  • -

    Åpningstider

    -

    - Glassbaren -
    - Andre lokaler? -
    - Generelle åpningstider? -

    +

    Åpningstider i dag

    + + + + + + + + + + + + + +
    Glassbaren15:00—00:30
    Bokcaféen19:00—23:30
    Ekspedisjonen15:00—00:00
    + Se alle åpningstider
    • diff --git a/web/src/components/layout/footer.module.scss b/web/src/components/layout/footer.module.scss index 66dc454..7631a5e 100644 --- a/web/src/components/layout/footer.module.scss +++ b/web/src/components/layout/footer.module.scss @@ -25,7 +25,7 @@ .contactItem { list-style: none; - grid-column: span 3; + grid-column: span 4; h2 { margin-bottom: 1em; @@ -36,7 +36,9 @@ } ul, - p { + p, + table, + a { font-size: var(--font-size-caption); } } \ No newline at end of file diff --git a/web/src/css/base.scss b/web/src/css/base.scss index cff948d..5101cfe 100644 --- a/web/src/css/base.scss +++ b/web/src/css/base.scss @@ -193,8 +193,8 @@ input[type="text"] { } .anchorLinks { - position: sticky; - top: 0; + /*position: sticky; + top: 0;*/ >span { display: block; @@ -213,4 +213,70 @@ input[type="text"] { background: var(--color-goldenBeige); color: var(--color-deepBrick); } +} + +.pageSection { + background: var(--color-neufPink); + margin: calc(var(--spacing-sitepadding)*2) calc(var(--spacing-sitepadding)*-1); + padding: var(--spacing-sitepadding) var(--spacing-sitepadding) var(--spacing-section-bottom); + + +.pageSection { + margin-top: calc(var(--spacing-sitepadding)*-2); + } + + &:nth-of-type(even) { + background: var(--color-goldenBeige); + color: var(--color-) + } + + h1 { + font-weight: 700; + text-transform: uppercase; + letter-spacing: .05em; + margin-bottom: 4rem; + + &:before { + content: ""; + display: inline-block; + background: currentColor; + border-radius: 1em; + height: 1em; + width: 1em; + vertical-align: middle; + margin-bottom: .2em; + margin-right: 1em; + } + } + + h2 { + margin-bottom: 1rem; + } + + h3 { + margin: 1rem 0; + } +} + +.openingHours { + width: 100%; + max-width: 20em; + font-size: inherit; + + td { + width: 50%; + vertical-align: top; + line-height: 1.2; + padding: .25em 0; + + &:first-child { + padding-right: 1rem; + } + } +} + +.openingHoursItem { + display: inline-block; + width: 50%; + vertical-align: top; + margin-bottom: var(--spacing-section-bottom); } \ No newline at end of file