diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index b0aaa4b..f9a9170 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -15,6 +15,9 @@ export default function RootLayout({ }>) { return ( + + +
{children} diff --git a/web/src/components/events/EventContainer.tsx b/web/src/components/events/EventContainer.tsx index 7f57e71..bfd15fb 100644 --- a/web/src/components/events/EventContainer.tsx +++ b/web/src/components/events/EventContainer.tsx @@ -51,6 +51,7 @@ export const EventContainer = ({
+
{mode === "list" && } {mode === "calendar" && } diff --git a/web/src/components/events/eventContainer.module.scss b/web/src/components/events/eventContainer.module.scss index 608d78e..5696730 100644 --- 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); } } diff --git a/web/src/components/general/Logo.tsx b/web/src/components/general/Logo.tsx index 1d83414..47f9798 100644 --- a/web/src/components/general/Logo.tsx +++ b/web/src/components/general/Logo.tsx @@ -6,6 +6,96 @@ export const Logo = () => { // Check if the current page is the index page const isIndexPage = usePathname() === "/"; + return ( +
+ + + + + + + + + + + + + + + + + + + + + +
+ ); +}; + +export const LogoText = () => { + // Check if the current page is the index page + const isIndexPage = usePathname() === "/"; + return (
diff --git a/web/src/components/general/logo.module.scss b/web/src/components/general/logo.module.scss index 0f70ce5..fbfb7ca 100644 --- 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 { diff --git a/web/src/css/base.scss b/web/src/css/base.scss index 4a76a92..e60e616 100644 --- 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; diff --git a/web/src/css/fonts.scss b/web/src/css/fonts.scss index a011c06..a4c0173 100644 --- 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"); diff --git a/web/src/css/variables.scss b/web/src/css/variables.scss index 88fd755..3934970 100644 --- 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