From 9e0466f78b8aef340ea762bbf4ebb32a5e3e7869 Mon Sep 17 00:00:00 2001 From: elisejakob Date: Mon, 20 May 2024 23:29:26 +0200 Subject: [PATCH] remove unused body component, adjust spacing when footer follows blocks with background color, etc --- web/src/app/page.tsx | 17 +-- .../blocks/featuredBlock.module.scss | 4 + .../blocks/imageSliderBlock.module.scss | 4 + .../components/events/eventItem.module.scss | 1 - web/src/components/general/Body.tsx | 88 ------------- web/src/components/general/body.module.scss | 123 ------------------ .../people/personSection.module.scss | 4 + web/src/css/base.scss | 2 +- 8 files changed, 22 insertions(+), 221 deletions(-) delete mode 100644 web/src/components/general/Body.tsx delete mode 100644 web/src/components/general/body.module.scss diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx index eb4c4ff..381e857 100644 --- a/web/src/app/page.tsx +++ b/web/src/app/page.tsx @@ -4,7 +4,8 @@ import { getClient } from "@/app/client"; import { FeaturedEvents } from "@/components/events/FeaturedEvents"; import { NewsList } from "@/components/news/NewsList"; import { UpcomingEvents } from "@/components/events/UpcomingEvents"; -import { Body } from "@/components/general/Body"; +import { IconListBlock } from "@/components/blocks/IconListBlock"; +import { FeaturedBlock } from "@/components/blocks/FeaturedBlock"; const HomeFragmentDefinition = graphql(` fragment Home on HomePage { @@ -47,13 +48,13 @@ export default async function Home() { return (
-
- - - -
«Hvor Glæden hersker, er alltid Fest»
- -
+ + + +
«Hvor Glæden hersker, er alltid Fest»
+ + +
); } diff --git a/web/src/components/blocks/featuredBlock.module.scss b/web/src/components/blocks/featuredBlock.module.scss index 8ea3e7c..632bedc 100644 --- a/web/src/components/blocks/featuredBlock.module.scss +++ b/web/src/components/blocks/featuredBlock.module.scss @@ -24,6 +24,10 @@ +.featuredBlock { margin-top: calc(var(--spacing-sitepadding)*-2); } + + &:last-child { + margin-bottom: 0; + } } .text { diff --git a/web/src/components/blocks/imageSliderBlock.module.scss b/web/src/components/blocks/imageSliderBlock.module.scss index a69f84d..32b7de7 100644 --- a/web/src/components/blocks/imageSliderBlock.module.scss +++ b/web/src/components/blocks/imageSliderBlock.module.scss @@ -34,4 +34,8 @@ background: rgba(0, 0, 0, .6); } } + + &:last-child { + margin-bottom: 0; + } } \ No newline at end of file diff --git a/web/src/components/events/eventItem.module.scss b/web/src/components/events/eventItem.module.scss index cb258d9..6ba6bbd 100644 --- a/web/src/components/events/eventItem.module.scss +++ b/web/src/components/events/eventItem.module.scss @@ -32,7 +32,6 @@ .image { width: 100%; padding-top: 60%; - background: var(--color-placeholder); position: relative; img { diff --git a/web/src/components/general/Body.tsx b/web/src/components/general/Body.tsx deleted file mode 100644 index 9a7f8be..0000000 --- a/web/src/components/general/Body.tsx +++ /dev/null @@ -1,88 +0,0 @@ -import { FeaturedBlock } from "../blocks/FeaturedBlock"; -import { IconListBlock } from "../blocks/IconListBlock"; -import styles from "./body.module.scss"; - -export const Body = () => { - return ( - <> - - - -
-

Heading 1

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor a interdum blandit. Sed ac purus sit amet libero posuere - molestie. Sed sodales nunc quis sapien malesuada, a faucibus turpis - blandit. Suspendisse potenti. Sed auctor enim et{" "} - augue dapibus, vitae laoreet lacus vulputate. Nulla - sed finibus diam. -

-

Heading 2

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor a interdum blandit. Sed ac purus sit amet{" "} - libero posuere - molestie. Sed sodales nunc quis sapien malesuada, a faucibus turpis - blandit.{" "} - - Suspendisse potenti - - . Sed auctor enim et augue dapibus, vitae laoreet lacus vulputate. - Nulla sed finibus diam. -

-

- Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. Sed auctor enim et augue dapibus, vitae laoreet - lacus vulputate. Nulla sed finibus diam. -

-

Heading 3

-
    -
  • - Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
    • -
  • - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor. -
    • -
-

Heading 4

-
    -
  1. - Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
    2. -
  2. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor. -
    3. -
-
Heading 5
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor a interdum blandit. -

-
Heading 6
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie - tortor a interdum blandit. -

-
- -
- Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
-
-
- -
- Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
-
-
- - ); -}; diff --git a/web/src/components/general/body.module.scss b/web/src/components/general/body.module.scss deleted file mode 100644 index 0c89ff0..0000000 --- a/web/src/components/general/body.module.scss +++ /dev/null @@ -1,123 +0,0 @@ -.body { - padding-bottom: var(--spacing-section-bottom); - - h1, - h2, - h3, - h4, - h5, - h6, - p, - ul, - ol, - blockquote { - margin: 0 auto; - } - - h1, - h2, - h3, - h4, - h5, - h6 { - margin: 2rem 0 1rem; - max-width: var(--size-width-p); - } - - h5, - h6 { - text-transform: uppercase; - letter-spacing: .04em; - } - - p { - margin-bottom: 1.4em; - font-size: var(--font-size-body); - max-width: var(--size-width-p); - } - - ul, - ol { - margin: 1em 0 2em; - font-size: var(--font-size-body); - max-width: 36em; - list-style: none; - - li { - position: relative; - margin-bottom: .75em; - padding-left: 2em; - - &:before { - position: absolute; - left: 0; - } - } - } - - ul { - li { - &:before { - content: ""; - left: .35em; - top: .4em; - display: block; - width: .75em; - height: .75em; - border-radius: 1em; - background: var(--color-goldenOrange); - } - } - } - - ol { - counter-reset: counter; - - li { - &:before { - counter-increment: counter; - content: counter(counter); - font-weight: 500; - color: var(--color-chateauBlue); - border-radius: 1em; - background: var(--color-placeholder); - width: 1.5em; - height: 1.5em; - text-align: center; - } - } - } - - strong { - font-weight: 700; - } - - em { - font-style: italic; - } - - a { - text-decoration-thickness: .1rem; - text-decoration-color: var(--color-goldenOrange); - font-weight: 500; - transition: text-decoration-color var(--transition-easing); - - &:hover { - text-decoration-color: currentColor; - } - } - - img { - max-width: 100%; - } - - figure { - margin: 2rem 0 2.4rem; - } - - figcaption { - font-size: var(--font-size-caption); - padding: .6rem 0; - max-width: var(--size-width-p); - } -} \ No newline at end of file diff --git a/web/src/components/people/personSection.module.scss b/web/src/components/people/personSection.module.scss index 3e978cc..ae36dc1 100644 --- a/web/src/components/people/personSection.module.scss +++ b/web/src/components/people/personSection.module.scss @@ -10,6 +10,10 @@ &:nth-of-type(even) { background: var(--color-background); } + + &:last-child { + margin-bottom: 0; + } } .heading { diff --git a/web/src/css/base.scss b/web/src/css/base.scss index 719fbf3..47de14d 100644 --- a/web/src/css/base.scss +++ b/web/src/css/base.scss @@ -35,7 +35,7 @@ body { } .site-main { - padding: var(--spacing-sitepadding); + padding: var(--spacing-sitepadding) var(--spacing-sitepadding) 0; min-height: 100vh; position: relative; animation: fadeUp .8s ease-out forwards;