move typekit import, add full logo, misc sketching

2024-05-15 01:28:10 +02:00
parent 644a7661da
commit 993102e1bf
8 changed files with 104 additions and 5 deletions
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@ -15,6 +15,9 @@ export default function RootLayout({
 }>) {
  return (
    <html lang="no">
+      <head>
+        <link rel="stylesheet" href="https://use.typekit.net/spa5smt.css" />
+      </head>
      <body>
        <Header />
        {children}
--- a/web/src/components/events/EventContainer.tsx
+++ b/web/src/components/events/EventContainer.tsx
@ -51,6 +51,7 @@ export const EventContainer = ({
        <div className={styles.displayOptions}>
          <button onClick={() => setMode(null)}>Vis liste</button>
          <button onClick={() => setMode("calendar")}>Vis kalender</button>
+          <button>Filter</button>
        </div>
        {mode === "list" && <EventList events={filteredEvents} />}
        {mode === "calendar" && <EventCalendar events={filteredEvents} />}
--- a/web/src/components/events/eventContainer.module.scss
+++ b/web/src/components/events/eventContainer.module.scss
@ -19,6 +19,8 @@

  button {
    border-radius: 0;
+    background: var(--color-deepBrick);
+    color: var(--color-goldenBeige);
  }
 }

--- a/web/src/components/general/Logo.tsx
+++ b/web/src/components/general/Logo.tsx
--- a/web/src/components/general/logo.module.scss
+++ b/web/src/components/general/logo.module.scss
@ -10,6 +10,10 @@
  svg {
    width: 100%;
  }
+
+  &.main {
+    margin: calc(var(--spacing-sitepadding)*-.6) 0 0 calc(var(--spacing-sitepadding)*-.6);
+  }
 }

 .logoIcon {
--- a/web/src/css/base.scss
+++ b/web/src/css/base.scss
@ -106,8 +106,8 @@ h6 {
 button,
 .button {
  border-radius: 10rem;
-  background: var(--color-cta);
-  color: var(--color-text);
+  background: var(--color-cta-background);
+  color: var(--color-cta-text);
  border: none;
  padding: .5rem 1rem;
  font-family: inherit;
--- a/web/src/css/fonts.scss
+++ b/web/src/css/fonts.scss
@ -1,5 +1,3 @@
-@import url("https://use.typekit.net/spa5smt.css");
-
 /*@font-face {
  font-family: 'Avenir';
  src: url('/assets/fonts/Avenir/Avenir.woff2') format("woff2");
--- a/web/src/css/variables.scss
+++ b/web/src/css/variables.scss
@ -29,7 +29,8 @@
  --color-text: var(--color-chateauBlue);
  --color-background: var(--color-betongGray);
  --color-background-secondary: var(--color-betongGray-darkened);
-  --color-cta: var(--color-goldenOrange);
+  --color-cta-background: var(--color-goldenOrange);
+  --color-cta-text: var(--color-black);
  --color-placeholder: var(--color-neufPink);

  // spacing