diff --git a/web/src/app/aktuelt/[slug]/page.tsx b/web/src/app/aktuelt/[slug]/page.tsx index 081e820..75560ef 100644 --- a/web/src/app/aktuelt/[slug]/page.tsx +++ b/web/src/app/aktuelt/[slug]/page.tsx @@ -50,8 +50,11 @@ export default async function Page({ params }: { params: { slug: string } }) { return (
-
-

{news.title}

+
+

+ Nyhet — {formatDate(news.firstPublishedAt, "d. MMMM yyyy")} +

+

{news.title}

{featuredImage && (
-
Bildetekst her?
{featuredImage.attribution && (
{featuredImage.attribution}
)}
)} -

{formatDate(news.firstPublishedAt, 'd. MMMM yyyy')}

diff --git a/web/src/app/foreninger/[slug]/page.tsx b/web/src/app/foreninger/[slug]/page.tsx index 58e7587..7422fb4 100644 --- a/web/src/app/foreninger/[slug]/page.tsx +++ b/web/src/app/foreninger/[slug]/page.tsx @@ -1,8 +1,10 @@ import { getClient } from "@/app/client"; import { Blocks } from "@/components/blocks/Blocks"; +import Icon from "@/components/general/Icon"; import Image from "@/components/general/Image"; import { graphql } from "@/gql"; import { AssociationFragment } from "@/gql/graphql"; +import Link from "next/link"; import { notFound } from "next/navigation"; export async function generateStaticParams() { @@ -51,8 +53,17 @@ export default async function Page({ params }: { params: { slug: string } }) { return (
+ + {association.associationType} +

{association.title}

+ {association.websiteUrl && ( + + Besøk nettside + + + )} {association.logo && (
- - - - - - - {association.websiteUrl && ( - - - - - )} - -
Type{association.associationType}
Nettside{association.websiteUrl}
); diff --git a/web/src/components/associations/associationItem.module.scss b/web/src/components/associations/associationItem.module.scss index f56dd85..7ac8dda 100644 --- a/web/src/components/associations/associationItem.module.scss +++ b/web/src/components/associations/associationItem.module.scss @@ -2,12 +2,10 @@ position: relative; list-style: none; display: grid; - grid-template-columns: 1fr 2fr; + grid-template-columns: 7rem 1fr; align-items: flex-start; column-gap: var(--spacing-gap-column); row-gap: var(--spacing-gap-row); - background: var(--color-white); - color: var(--color-black); padding: var(--spacing-s); } diff --git a/web/src/components/associations/associationList.module.scss b/web/src/components/associations/associationList.module.scss index 1bbe930..a1fa670 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(3, 1fr); + grid-template-columns: 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/blocks/featuredBlock.module.scss b/web/src/components/blocks/featuredBlock.module.scss index ea5d844..8a1a91c 100644 --- a/web/src/components/blocks/featuredBlock.module.scss +++ b/web/src/components/blocks/featuredBlock.module.scss @@ -6,6 +6,28 @@ grid-template-columns: repeat(2, 1fr); column-gap: var(--spacing-gap-column); + &[data-background-color="deepBrick"] { + background-color: var(--color-deepBrick); + } + + &[data-background-color="neufPink"] { + background-color: var(--color-neufPink); + } + + &[data-background-color="goldenOrange"] { + background-color: var(--color-goldenOrange); + color: var(--color-deepBrick); + } + + &[data-background-color="goldenBeige"] { + background-color: var(--color-goldenBeige); + } + + &[data-background-color="chateauBlue"] { + background-color: var(--color-chateauBlue); + color: var(--color-betongGray); + } + &:nth-of-type(even) { .text { order: 2; diff --git a/web/src/components/events/eventFilter.module.scss b/web/src/components/events/eventFilter.module.scss index cd00c44..769a60a 100644 --- a/web/src/components/events/eventFilter.module.scss +++ b/web/src/components/events/eventFilter.module.scss @@ -2,15 +2,16 @@ display: grid; grid-template-rows: 0fr; transition: grid-template-rows .5s ease; - margin: var(--spacing-sitepadding-block) calc(var(--spacing-sitepadding-inline)*-1) 0; + margin: 0 calc(var(--spacing-sitepadding-inline)*-1) 0; + transition: margin .5s ease; .filterContent { background-color: var(--color-background); - padding: var(--spacing-s) var(--spacing-sitepadding-inline); + padding: 0 var(--spacing-sitepadding-inline); min-height: 0; visibility: hidden; opacity: 0; - transition: visibility .5s, opacity .5s ease, background-color .5s ease; + transition: visibility .5s ease, padding .5s ease, opacity .5s ease, background-color .5s ease; } .filterItem { @@ -44,8 +45,10 @@ &[data-show=true] { grid-template-rows: 1fr; + margin: var(--spacing-sitepadding-block) calc(var(--spacing-sitepadding-inline)*-1) 0; .filterContent { + padding: var(--spacing-s) var(--spacing-sitepadding-inline); background-color: var(--color-background-secondary); visibility: visible; opacity: 1; diff --git a/web/src/components/layout/Footer.tsx b/web/src/components/layout/Footer.tsx index d618a10..2998a10 100644 --- a/web/src/components/layout/Footer.tsx +++ b/web/src/components/layout/Footer.tsx @@ -49,12 +49,16 @@ export const Footer = () => {
Generelle henvendelser
- post@neuf.no + + post@neuf.no +
Billetter
- billetter@neuf.no + + billetter@neuf.no +
Øvrig kontaktinfo diff --git a/web/src/components/layout/footer.module.scss b/web/src/components/layout/footer.module.scss index 786ba12..9d18cf4 100644 --- a/web/src/components/layout/footer.module.scss +++ b/web/src/components/layout/footer.module.scss @@ -6,10 +6,6 @@ z-index: 700; font-size: var(--font-size-caption); overflow: hidden; - - a { - font-size: var(--font-size-caption); - } } .contactList { @@ -91,11 +87,18 @@ } } +.emailLink { + font-family: var(--font-serif); + font-size: var(--font-size-lead); +} + .pig { position: absolute; bottom: -2rem; right: -2rem; z-index: 800; + + display: none; } .toTop { diff --git a/web/src/components/layout/header.module.scss b/web/src/components/layout/header.module.scss index f802fbe..035b03e 100644 --- a/web/src/components/layout/header.module.scss +++ b/web/src/components/layout/header.module.scss @@ -196,5 +196,5 @@ .observer { position: absolute; top: calc(100vh + 8rem); - height: calc(100% - 100vh - 8rem); + height: 100%; } \ No newline at end of file diff --git a/web/src/css/base.scss b/web/src/css/base.scss index 02e80be..a5573dd 100644 --- a/web/src/css/base.scss +++ b/web/src/css/base.scss @@ -125,6 +125,7 @@ h6 { img { max-width: 100%; + height: auto; } blockquote { diff --git a/web/src/css/main.scss b/web/src/css/main.scss index 560da78..2c60609 100644 --- a/web/src/css/main.scss +++ b/web/src/css/main.scss @@ -3,4 +3,6 @@ @import 'animations.scss'; @import 'base.scss'; -@import 'button.scss'; \ No newline at end of file +@import 'button.scss'; + +@import 'news.scss'; \ No newline at end of file diff --git a/web/src/css/news.scss b/web/src/css/news.scss new file mode 100644 index 0000000..31388bb --- /dev/null +++ b/web/src/css/news.scss @@ -0,0 +1,21 @@ +.news-header { + display: block; + text-align: center; +} + +.news-title { + font-size: var(--font-size-h1); + margin: 1rem auto 2rem; +} + +.news-details { + display: block; + font-weight: 400; + font-size: var(--font-size-xs); + margin-bottom: var(--spacing-s); + margin: 0 auto; + + a { + text-decoration: none; + } +} \ No newline at end of file