diff --git a/frontend/src/app.scss b/frontend/src/app.scss index a0f2762..27a294d 100644 --- a/frontend/src/app.scss +++ b/frontend/src/app.scss @@ -23,7 +23,7 @@ $color-brown: #af590c; $color-text: $color-dark; // Typography -$font-family-primary: 'Cinzel', sans-serifS; +$font-family-primary: 'Cinzel', sans-serif; $font-family-secondary: 'Lora', sans-serif; // Font sizes @@ -151,7 +151,7 @@ body { // background-position: top; // background-size: cover; min-height: 100vh; - font-family: 'Lora', sans-serif; + font-family: $font-family-secondary; } .container-all { @@ -167,7 +167,7 @@ body { margin-left: calc(-50vw + 50%) !important; transition: transform 0.1s ease-in-out; padding: 2rem 0; - font-family: 'Cinzel', sans-serif; + font-family: $font-family-primary; &-item { font-weight: 600; color: $color-primary; @@ -180,15 +180,29 @@ body { } img { + /*max-height: 2rem;*/ max-height: 3rem; transform: rotate(5deg); } &.brand { - // FIXME @include mixins.desktop { - padding: 0; transform: scale(1.2); + transform-origin: left center; + } + } + + .brand-home-label { + font-family: $font-family-primary; + font-size: 1em; + font-weight: 600; + line-height: inherit; + color: inherit; + white-space: nowrap; + + @include mixins.desktop { + transform: scale(0.8333); + transform-origin: left center; } } } @@ -200,13 +214,15 @@ body { &-right { width: 100%; justify-content: flex-end; - padding-right: 5rem; + padding-right: 5rem; } + &-left { width: 100%; justify-content: flex-start; - padding-left: 5rem; + padding-left: 5rem; } + &-burger { color: $color-primary; &:hover { @@ -390,6 +406,31 @@ footer { } } +.content { + ul { + list-style: none; + padding-left: 0; + margin-left: 0; + } + + ul li { + position: relative; + padding-left: 1.4rem; + margin-bottom: 0.75rem; + line-height: 1.65; + } + + ul li::before { + content: "✦"; + position: absolute; + left: 0; + top: 0.05rem; + color: #b06b2d; + font-size: 0.9rem; + line-height: 1.65; + } +} + .content-location { h4 { margin-top: 3rem; @@ -480,3 +521,7 @@ footer { margin-bottom: 0.625rem; } } + +@import url('https://fonts.googleapis.com/css2?family=Cinzel:wght@400;500;600;700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Lora:wght@400;500;600;700&display=swap'); +/* @import 'https://fonts.googleapis.com/css?family=Vollkorn:400,700'; */ \ No newline at end of file diff --git a/frontend/src/assets/images/easyfest-logo.svg b/frontend/src/assets/images/easyfest-logo.svg index 9fde497..7bcfd0a 100644 --- a/frontend/src/assets/images/easyfest-logo.svg +++ b/frontend/src/assets/images/easyfest-logo.svg @@ -1 +1,610 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/assets/images/easyfest_okhand.png b/frontend/src/assets/images/easyfest_okhand.png index 3ee83f4..cbd6db9 100644 Binary files a/frontend/src/assets/images/easyfest_okhand.png and b/frontend/src/assets/images/easyfest_okhand.png differ diff --git a/frontend/src/lib/Footer.svelte b/frontend/src/lib/Footer.svelte index 76a2288..0b7645c 100644 --- a/frontend/src/lib/Footer.svelte +++ b/frontend/src/lib/Footer.svelte @@ -37,7 +37,7 @@
- + {#if data.logo_horiz} {data.title} {:else} diff --git a/frontend/src/lib/Header.svelte b/frontend/src/lib/Header.svelte index 574ce93..a42394a 100644 --- a/frontend/src/lib/Header.svelte +++ b/frontend/src/lib/Header.svelte @@ -100,7 +100,9 @@ {:else} {data.title} {/if} + Mereth Gaerlen + {#if showMenu} + {/each} +
+ + {#each crew as publicprofile, i (getProfileKey(publicprofile))} + + {/each} +
+ {/if} +
+ + + diff --git a/frontend/src/routes/venue-info/+page.svelte b/frontend/src/routes/venue-info/+page.svelte index 78b6fd9..0765cbe 100644 --- a/frontend/src/routes/venue-info/+page.svelte +++ b/frontend/src/routes/venue-info/+page.svelte @@ -10,12 +10,130 @@
-
+
{#if data.content} - +
+ +
{/if}
+ + \ No newline at end of file diff --git a/frontend/static/img/easyfest_logo.png b/frontend/static/img/easyfest_logo.png index a7dbccf..7ad1eb3 100644 Binary files a/frontend/static/img/easyfest_logo.png and b/frontend/static/img/easyfest_logo.png differ