diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte index ba2fa3f..ae80987 100644 --- a/src/lib/components/Header.svelte +++ b/src/lib/components/Header.svelte @@ -2,22 +2,16 @@ import { page } from '$app/stores'; import Navigation from './Navigation.svelte'; - function pathIs(string) { - return $page.url.pathname === string; - } - - function pathStartsWith(string) { - return $page.url.pathname.startsWith(string); - } - const needsWhiteBackground = $derived($page.url.pathname === '/research'); const textColor = $derived(needsWhiteBackground ? 'white' : 'black');
@@ -31,6 +25,16 @@ margin-bottom: 30px; color: var(--textColor); } + a { + color: var(--textColor); + } + a:link, + a:visited { + color: var(--textColor); + } + a:hover { + color: var(--currentPageColor); + } .site-heading { margin-top: 0px; @@ -48,7 +52,7 @@ padding-bottom: 20px; } /* Computers */ - @media only screen and (min-width: 1000px) { + @media only screen and (min-width: 801px) { .site-heading { font-size: 53px; } @@ -57,16 +61,19 @@ } } /* Tablets */ - @media screen and (min-width: 801px) and (max-width: 999px) { + /* @media screen and (min-width: 801px) and (max-width: 999px) { .site-heading { font-size: 53px; } .site-subheading { font-size: 19px; } - } + } */ /* Phones */ @media screen and (max-width: 800px) { + header { + border-bottom: 1px solid var(--textColor); + } .site-heading { width: calc(100vw - 100px); font-size: calc(100vw / 12); @@ -75,5 +82,8 @@ width: calc(100vw - 100px); font-size: calc(100vw / 30); } + .logo { + padding-bottom: 15px; + } } diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte index 3e704eb..addfb6d 100644 --- a/src/lib/components/Navigation.svelte +++ b/src/lib/components/Navigation.svelte @@ -86,14 +86,14 @@ z-index: 100; position: absolute; top: 0px; - left: 2.5vw; - width: 95vw; + right: 2.5vw; + width: 25vw; text-align: right; - border-bottom: 1px solid var(--textColor); + /* border-bottom: 1px solid var(--textColor); */ } /* Computers */ - @media only screen and (min-width: 1000px) { + @media only screen and (min-width: 801px) { .hamburger { display: none; } @@ -105,7 +105,7 @@ } } /* Tablets */ - @media screen and (min-width: 801px) and (max-width: 999px) { + /* @media screen and (min-width: 801px) and (max-width: 999px) { .hamburger { display: none; } @@ -115,15 +115,16 @@ .navigation > a:not(:first-child) { margin-left: 30px; } - } + } */ /* Phones */ @media screen and (max-width: 800px) { .navigation { display: none; z-index: 100; - background-color: var(--emilylightishgrey); + background-color: var(--emilylightgrey); + border-left: 1px solid var(--textColor); position: absolute; - width: 85vw; + width: 65vw; right: 2.5vw; flex-flow: column; text-align: right; @@ -140,7 +141,7 @@ .navigation > a { margin-right: 10px; text-transform: uppercase; - font-size: 35px; + font-size: 30px; font-weight: 650; } .navigation > a:not(:first-child) {