diff --git a/web/src/components/blocks/featuredBlock.module.scss b/web/src/components/blocks/featuredBlock.module.scss
index 9362f34..ea5d844 100644
--- a/web/src/components/blocks/featuredBlock.module.scss
+++ b/web/src/components/blocks/featuredBlock.module.scss
@@ -1,6 +1,6 @@
.featuredBlock {
background: var(--color-background-secondary);
- margin: calc(var(--spacing-sitepadding-block)*2) calc(var(--spacing-sitepaddign-inline)*-1);
+ margin: calc(var(--spacing-sitepadding-block)*2) calc(var(--spacing-sitepadding-inline)*-1);
padding: var(--spacing-sitepadding-block) var(--spacing-sitepadding-inline);
display: grid;
grid-template-columns: repeat(2, 1fr);
diff --git a/web/src/components/blocks/horizontalRuleBlock.module.scss b/web/src/components/blocks/horizontalRuleBlock.module.scss
index f6ce7ca..5387368 100644
--- a/web/src/components/blocks/horizontalRuleBlock.module.scss
+++ b/web/src/components/blocks/horizontalRuleBlock.module.scss
@@ -1,7 +1,6 @@
.horizontalRuleBlock {
height: 3rem;
width: 100%;
- max-width: var(--size-width-p);
margin: var(--spacing-s) auto var(--spacing-section-bottom);
overflow: hidden;
position: relative;
diff --git a/web/src/components/blocks/richTextBlock.module.scss b/web/src/components/blocks/richTextBlock.module.scss
index 82c6c97..d8a4c43 100644
--- a/web/src/components/blocks/richTextBlock.module.scss
+++ b/web/src/components/blocks/richTextBlock.module.scss
@@ -101,11 +101,11 @@
font-style: italic;
max-width: calc(var(--size-width-p) * 1.4);
margin: 2rem 0 3.2rem;
- text-align: center;
}
- strong {
- font-weight: 700;
+ strong,
+ b {
+ font-weight: 600;
}
em {
diff --git a/web/src/components/events/EventHeader.tsx b/web/src/components/events/EventHeader.tsx
index 3a51377..2fda03e 100644
--- a/web/src/components/events/EventHeader.tsx
+++ b/web/src/components/events/EventHeader.tsx
@@ -26,9 +26,9 @@ export const EventHeader = ({ event }: { event: EventFragment }) => {
Arrangement
{event.title}
-
+
- {/*
Pris
*/}
+
Pris:
{event.free && (
-
@@ -55,24 +55,31 @@ export const EventHeader = ({ event }: { event: EventFragment }) => {
)}
- {event.ticketUrl && (
-
- Kjøp billetter
-
-
- )}
- {event.facebookUrl && (
-
- Gå til Facebook-event
-
- )}
{event.categories.length > 0 && (
- Kategorier: {event.categories.map((x) => x.name).join(", ")}
+ Kategorier:{" "}
+ {event.categories.map((x) => x.name).join(", ")}
+
+ )}
+ {event.organizers && (
+
+ Arrangeres av:{" "}
+
)}
- {event.organizers &&
}
+ {event.ticketUrl && (
+
+ Kjøp billetter
+
+
+ )}
+ {event.facebookUrl && (
+
+ Gå til Facebook-event
+
+
+ )}
{featuredImage && (
diff --git a/web/src/components/events/OrganizerList.tsx b/web/src/components/events/OrganizerList.tsx
index 903f41a..dfa25c6 100644
--- a/web/src/components/events/OrganizerList.tsx
+++ b/web/src/components/events/OrganizerList.tsx
@@ -8,22 +8,18 @@ import Link from "next/link";
export const OrganizerList = ({ event }: { event: EventFragment }) => {
return (
-
-
Arrangeres av
-
- {event.organizers.map((organizer) => {
- const url =
- organizer.association?.url ?? organizer.externalUrl ?? null;
- if (typeof url === "string" && url.startsWith("http")) {
- return (
- -
- {organizer.name}
-
- );
- }
- return - {organizer.name}
;
- })}
-
-
+
+ {event.organizers.map((organizer) => {
+ const url = organizer.association?.url ?? organizer.externalUrl ?? null;
+ if (typeof url === "string" && url.startsWith("http")) {
+ return (
+ -
+ {organizer.name}
+
+ );
+ }
+ return - {organizer.name}
;
+ })}
+
);
};
diff --git a/web/src/components/events/dateList.module.scss b/web/src/components/events/dateList.module.scss
index f52608a..2df0124 100644
--- a/web/src/components/events/dateList.module.scss
+++ b/web/src/components/events/dateList.module.scss
@@ -1,7 +1,11 @@
+.dateWrapper {
+ background: var(--color-background-secondary);
+ margin: 0 calc(var(--spacing-sitepadding-inline)*-1) var(--spacing-sitepadding-block);
+ padding: var(--spacing-s) var(--spacing-sitepadding-inline) var(--spacing-m);
+}
+
.dateList {
list-style: none;
- margin: 0 calc(var(--spacing-sitepadding-inline)*-1) calc(var(--spacing-sitepadding-block)*2);
- padding: 0 var(--spacing-sitepadding-inline);
display: flex;
gap: var(--spacing-s);
}
diff --git a/web/src/components/events/eventHeader.module.scss b/web/src/components/events/eventHeader.module.scss
index d888b19..bf3d6de 100644
--- a/web/src/components/events/eventHeader.module.scss
+++ b/web/src/components/events/eventHeader.module.scss
@@ -4,7 +4,7 @@
grid-template-columns: repeat(3, 1fr);
column-gap: var(--spacing-gap-column);
align-items: flex-end;
- padding: 0 0 var(--spacing-sitepadding-inline) 0;
+ padding: 0;
}
.title {
@@ -18,29 +18,62 @@
img {
max-width: 100%;
height: auto;
+ display: block;
}
}
-.details {}
+.text {
+ padding-bottom: var(--spacing-m);
+}
+
+.eventDetails {
+ font-size: var(--font-size-caption);
+ margin: var(--spacing-m) 0;
+
+ >div {
+ padding: var(--spacing-xs) 0;
+ border-bottom: var(--border);
+ display: flex;
+ }
+}
.prices {
- margin: 2rem 0 var(--spacing-s);
-
- h2 {
- font-size: var(--spacing-s);
- font-family: var(--font-main);
- }
+ padding: var(--spacing-xs) 0 0;
+ border-top: var(--border);
+ display: flex;
}
.priceList {
list-style: none;
+ //flex-grow: 1;
}
.priceItem {
- font-size: var(--font-size-caption);
position: relative;
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 1rem;
+ /*padding: var(--spacing-xs) 0;
+ border-bottom: var(--border);
+
+ &:first-child {
+ padding-top: 0;
+ }
+
+ &:last-child {
+ border-bottom: 0;
+ padding-bottom: 0;
+ }*/
}
.priceLabel {
+ display: block;
+}
+
+.label {
font-weight: 600;
+}
+
+.label {
+ width: 7rem;
}
\ 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 64db857..ab1c7e1 100644
--- a/web/src/components/events/eventItem.module.scss
+++ b/web/src/components/events/eventItem.module.scss
@@ -121,4 +121,10 @@
padding: 0 .4rem;
font-size: var(--font-size-xs);
font-family: var(--font-main);
+ font-weight: 500;
+}
+
+.moreDates {
+ color: var(--color-goldenBeige);
+ background: var(--color-deepBrick);
}
\ No newline at end of file
diff --git a/web/src/components/events/organizerList.module.scss b/web/src/components/events/organizerList.module.scss
index d24420f..8c1f3a5 100644
--- a/web/src/components/events/organizerList.module.scss
+++ b/web/src/components/events/organizerList.module.scss
@@ -1,10 +1,9 @@
.organizerList {
- h2 {
- font-size: inherit;
- font-weight: inherit;
- }
+ list-style: none;
+ display: inline;
- ul {
- list-style: none;
+ li {
+ display: inline;
+ font-size: var(--font-size-caption);
}
}
\ No newline at end of file
diff --git a/web/src/components/layout/Footer.tsx b/web/src/components/layout/Footer.tsx
index b2aea48..d618a10 100644
--- a/web/src/components/layout/Footer.tsx
+++ b/web/src/components/layout/Footer.tsx
@@ -12,25 +12,31 @@ export const Footer = () => {
Følg oss
-
-
+
Instagram
-
-
+
Facebook
-
-
- Twitter
-
-
-
- -
-
+
Flickr
diff --git a/web/src/components/layout/footer.module.scss b/web/src/components/layout/footer.module.scss
index 8534eac..786ba12 100644
--- a/web/src/components/layout/footer.module.scss
+++ b/web/src/components/layout/footer.module.scss
@@ -1,13 +1,14 @@
.footer {
padding: var(--spacing-sitepadding-block) var(--spacing-sitepadding-inline);
- background: var(--color-chateauBlue);
+ background: var(--color-deepBrick);
color: var(--color-betongGray);
position: relative;
z-index: 700;
+ font-size: var(--font-size-caption);
+ overflow: hidden;
- button {
+ a {
font-size: var(--font-size-caption);
- background: var(--color-neufPink);
}
}
@@ -91,14 +92,20 @@
}
.pig {
- position: relative;
- top: 0;
- right: 0;
+ position: absolute;
+ bottom: -2rem;
+ right: -2rem;
z-index: 800;
}
.toTop {
position: absolute;
+ z-index: 801;
right: var(--spacing-sitepadding-inline);
bottom: var(--spacing-sitepadding-block);
+ cursor: pointer;
+
+ button {
+ font-size: var(--font-size-caption);
+ }
}
\ No newline at end of file
diff --git a/web/src/css/button.scss b/web/src/css/button.scss
index ebda602..2b34537 100644
--- a/web/src/css/button.scss
+++ b/web/src/css/button.scss
@@ -24,6 +24,12 @@ button,
text-decoration: none;
}
+ &.cta {
+ padding: calc(var(--spacing-xs)*1.5) calc(var(--spacing-s)*1.5);
+ display: flex;
+ justify-content: space-between;
+ }
+
&.secondary {
color: var(--color-deepBrick);
background: var(--color-goldenBeige);