merge with upsteam 1d6a799ca1

This commit is contained in:
sevichecc 2022-11-19 14:48:03 +08:00
parent 61d8b528bd
commit 9f3dd18a29
2 changed files with 16 additions and 12 deletions

View file

@ -61,7 +61,7 @@
{#if headerConfig.nav} {#if headerConfig.nav}
<Nav {path} {title} {pin} {scrollY} nav={headerConfig.nav} /> <Nav {path} {title} {pin} {scrollY} nav={headerConfig.nav} />
{/if} {/if}
<a href="/" sveltekit:prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a> <a href="/" data-sveltekit-prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a>
</div> </div>
<div class="navbar-end"> <div class="navbar-end">
{#if headerConfig.search} {#if headerConfig.search}

View file

@ -6,6 +6,8 @@
export let pin: boolean export let pin: boolean
</script> </script>
<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
<div class="dropdown lg:hidden"> <div class="dropdown lg:hidden">
<label for="navbar-dropdown" tabindex="0" class="btn btn-square btn-ghost"> <label for="navbar-dropdown" tabindex="0" class="btn btn-square btn-ghost">
<span class="i-heroicons-outline-menu-alt-1" /> <span class="i-heroicons-outline-menu-alt-1" />
@ -14,11 +16,12 @@
id="navbar-dropdown" id="navbar-dropdown"
tabindex="0" tabindex="0"
class:hidden={!pin} class:hidden={!pin}
class="menu menu-compact dropdown-content bg-base-100 text-base-content shadow-lg rounded-box min-w-max max-w-52 p-2"> class="menu menu-compact dropdown-content bg-base-100 text-base-content shadow-lg rounded-box min-w-max max-w-52 p-2
">
{#each nav as { text, link, children }} {#each nav as { text, link, children }}
{#if link && !children} {#if link && !children}
<li> <li>
<a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a> <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{:else if children} {:else if children}
<li tabindex="0"> <li tabindex="0">
@ -29,7 +32,7 @@
<ul class="bg-base-100 text-base-content shadow-lg p-2"> <ul class="bg-base-100 text-base-content shadow-lg p-2">
{#each children as { text, link }} {#each children as { text, link }}
<li> <li>
<a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a> <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{/each} {/each}
</ul> </ul>
@ -49,18 +52,19 @@
{#each nav as { text, link, children }} {#each nav as { text, link, children }}
{#if link && !children} {#if link && !children}
<li> <li>
<a sveltekit:prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a> <a data-sveltekit-prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{:else if children} {:else if children}
<li tabindex="0"> <li >
<span class:font-bold={children.some(({ link }) => link === path)} class="!rounded-btn gap-1"> <span class:font-bold={children.some(({ link }) => link === path)} class="!rounded-btn gap-1">
{text} {text}
<span class="i-heroicons-solid-chevron-down -mr-1" /> <span class="i-heroicons-solid-chevron-down -mr-1" />
</span> </span>
<ul class="bg-base-100 text-base-content shadow-lg p-2"> <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<ul tabindex="0" class="menu rounded-box bg-base-100 text-base-content shadow-lg p-2">
{#each children as { text, link }} {#each children as { text, link }}
<li> <li>
<a sveltekit:prefetch class:font-bold={link === path} href={link}>{text}</a> <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{/each} {/each}
</ul> </ul>