diff options
| author | Adam Soltys <[email protected]> | 2023-12-06 21:25:00 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-12-06 21:25:00 -0800 |
| commit | b485a1bfc6dbbf43cca8652b2a509f6b4a30c4f4 (patch) | |
| tree | a9358f70094660abcd651561207a3e0dc2c98d7f /src/components | |
| parent | 6b3ff247e4125941a611369ed9bb74a2ffca57d8 (diff) | |
| download | coinos-ui-b485a1bfc6dbbf43cca8652b2a509f6b4a30c4f4.tar.gz coinos-ui-b485a1bfc6dbbf43cca8652b2a509f6b4a30c4f4.zip | |
merge fixes
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/AppHeader.svelte | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 8aa084c8..d7045d5f 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -109,7 +109,6 @@ ><Icon icon="menu" style="mx-auto w-6 md:w-8" /> </button> -<<<<<<< HEAD <div class="{showMenu ? 'block' @@ -145,47 +144,7 @@ <Avatar user={subject} /> </div> </header> -======= - <div - class="{showMenu - ? 'block' - : 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z-50" - > - <ul class="space-y-5 w-48"> - {#each menuButtons as { href, icon, key }} - <li> - <a {href} data-sveltekit-prefetch="off"> - <button - class="flex justify-center items-center font-semibold hover:opacity-80" - ><Icon {icon} style="mr-2 w-6 md:w-8" /> {$t(key)} - </button> - </a> - </li> - {/each} - </ul> - <hr class="my-4" /> - <a href="/" - ><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a - > - </div> - </OutClick> - </div> - {:else} - <a href={`/login?redirect=${$page.url.pathname}`}> - <button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm" - >{$t("nav.signIn")}</button - > - </a> - {/if} - </nav> - <div - class="absolute md:w-[64px] md:mx-auto lg:left-[164px] left-[calc(50vw-64px)] -bottom-[64px] z-30" - > - <Avatar user={subject} /> - </div> - </header> {/if} ->>>>>>> master <style> .z { |