diff --git a/web/src/components/blocks/FeaturedBlock.tsx b/web/src/components/blocks/FeaturedBlock.tsx new file mode 100644 index 0000000..2ed6e2a --- /dev/null +++ b/web/src/components/blocks/FeaturedBlock.tsx @@ -0,0 +1,18 @@ +import styles from "./featuredBlock.module.scss"; + +export const FeaturedBlock = ({ block }: any) => { + return ( +
+
+

En fremhevet artikkel eller side

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie + tortor a interdum blandit. Sed ac purus sit amet libero posuere + molestie. +

+ Mer om denne saken → +
+
+
+ ); +}; diff --git a/web/src/components/blocks/featuredBlock.module.scss b/web/src/components/blocks/featuredBlock.module.scss new file mode 100644 index 0000000..8ea3e7c --- /dev/null +++ b/web/src/components/blocks/featuredBlock.module.scss @@ -0,0 +1,56 @@ +.featuredBlock { + background: var(--color-background-secondary); + margin: calc(var(--spacing-sitepadding)*2) calc(var(--spacing-sitepadding)*-1); + padding: var(--spacing-sitepadding); + display: grid; + grid-template-columns: repeat(2, 1fr); + column-gap: var(--spacing-gap-column); + + &:nth-of-type(even) { + .text { + order: 2; + align-items: flex-start; + + p { + text-align: left; + } + } + + .image { + order: 1; + } + } + + +.featuredBlock { + margin-top: calc(var(--spacing-sitepadding)*-2); + } +} + +.text { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-end; + gap: var(--spacing-gap-row); + + h2 { + font-size: var(--font-size-h2); + } + + p { + text-align: right; + } + + a { + font-family: var(--font-serif); + font-size: var(--font-size-lead); + font-style: italic; + text-decoration: none; + } +} + +.image { + width: 100%; + padding-top: 60%; + background: var(--color-placeholder); +} \ No newline at end of file diff --git a/web/src/components/blocks/richTextBlock.module.scss b/web/src/components/blocks/richTextBlock.module.scss index 12857d6..cb3f55c 100644 --- a/web/src/components/blocks/richTextBlock.module.scss +++ b/web/src/components/blocks/richTextBlock.module.scss @@ -67,7 +67,7 @@ font-weight: 500; color: var(--color-chateauBlue); border-radius: 1em; - background: var(--color-neufPink); + background: var(--color-placeholder); width: 1.5em; height: 1.5em; text-align: center; diff --git a/web/src/components/events/eventItem.module.scss b/web/src/components/events/eventItem.module.scss index d84d3b1..8cf1975 100644 --- a/web/src/components/events/eventItem.module.scss +++ b/web/src/components/events/eventItem.module.scss @@ -5,13 +5,16 @@ .image { width: 100%; - height: auto; - // padding-top: 60%; - background: var(--color-neufPink); + padding-top: 60%; + background: var(--color-placeholder); + position: relative; img { + position: absolute; + top: 0; width: 100%; - height: auto; + height: 100%; + object-fit: cover; } } @@ -26,4 +29,4 @@ .details { font-family: var(--font-serif); -} +} \ No newline at end of file diff --git a/web/src/components/general/Body.tsx b/web/src/components/general/Body.tsx index fdc5ca6..ce689d6 100644 --- a/web/src/components/general/Body.tsx +++ b/web/src/components/general/Body.tsx @@ -1,81 +1,86 @@ +import { FeaturedBlock } from "../blocks/FeaturedBlock"; 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

- -

Heading 4

-
    -
  1. - Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
  2. -
  3. + 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. -

  4. -
-
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. -

-
- -
+ 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 sodales nunc quis sapien malesuada, a faucibus turpis blandit. - Suspendisse potenti. -
-
-
+ Suspendisse potenti. Sed auctor enim et augue dapibus, vitae laoreet + lacus vulputate. Nulla sed finibus diam. +

+

Heading 3

+ +

Heading 4

+
    +
  1. + Sed sodales nunc quis sapien malesuada, a faucibus turpis blandit. + Suspendisse potenti. +
  2. +
  3. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut molestie + tortor. +
  4. +
+
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 index 2f3ac7a..f6e9d27 100644 --- a/web/src/components/general/body.module.scss +++ b/web/src/components/general/body.module.scss @@ -67,7 +67,7 @@ font-weight: 500; color: var(--color-chateauBlue); border-radius: 1em; - background: var(--color-neufPink); + background: var(--color-placeholder); width: 1.5em; height: 1.5em; text-align: center; diff --git a/web/src/components/layout/footer.module.scss b/web/src/components/layout/footer.module.scss index 84c7dc6..6af99de 100644 --- a/web/src/components/layout/footer.module.scss +++ b/web/src/components/layout/footer.module.scss @@ -3,7 +3,7 @@ justify-content: space-between; align-items: flex-end; padding: var(--spacing-sitepadding); - background: #ccc; + background: var(--color-background-secondary); } .contactList { diff --git a/web/src/components/people/personItem.module.scss b/web/src/components/people/personItem.module.scss index 29e64a3..de8e192 100644 --- a/web/src/components/people/personItem.module.scss +++ b/web/src/components/people/personItem.module.scss @@ -10,7 +10,7 @@ flex: none; width: 7rem; height: 7rem; - background: var(--color-neufPink); + background: var(--color-placeholder); border-radius: 100%; } diff --git a/web/src/css/variables.scss b/web/src/css/variables.scss index c7decef..ad9d4bc 100644 --- a/web/src/css/variables.scss +++ b/web/src/css/variables.scss @@ -6,6 +6,7 @@ --font-size-caption: .8rem; --font-size-body: 1rem; --font-size-lead: 1.4rem; + --font-size-h2: 1.8rem; // colors @@ -20,10 +21,15 @@ --color-white: #fff; --color-black: rgb(22, 21, 22); + // additional colors adjusted for web + --color-betongGray-darkened: rgb(220, 216, 204); + // colors in use --color-text: var(--color-chateauBlue); --color-background: var(--color-betongGray); + --color-background-secondary: var(--color-betongGray-darkened); --color-cta: var(--color-goldenOrange); + --color-placeholder: var(--color-neufPink); // spacing --spacing-sitepadding: 2rem;