merge with upsteam 950fc38068

This commit is contained in:
sevichecc 2023-01-26 00:22:34 +08:00
parent a8a6fd43d4
commit bae3b10a94
6 changed files with 25 additions and 35 deletions

View file

@ -16,7 +16,7 @@
<p> <p>
{#if footerConfig.nav} {#if footerConfig.nav}
{#each footerConfig.nav as { text, link }, i} {#each footerConfig.nav as { text, link }, i}
<a href={link} rel="noopener external" target="_blank">{text}</a> <a href={link} rel="noopener noreferrer external" target="_blank">{text}</a>
{#if i + 1 < footerConfig.nav.length} {#if i + 1 < footerConfig.nav.length}
<span class="mr-1">·</span> <span class="mr-1">·</span>
{/if} {/if}
@ -30,7 +30,7 @@
<br /> <br />
Powered by Powered by
<a <a
rel="noopener external" rel="noopener noreferrer external"
target="_blank" target="_blank"
class="tooltip tooltip-secondary hover:text-secondary" class="tooltip tooltip-secondary hover:text-secondary"
data-tip="🌸 [δ] - Based on MDsveX & SvelteKit 🌸" data-tip="🌸 [δ] - Based on MDsveX & SvelteKit 🌸"

View file

@ -62,7 +62,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="/" data-sveltekit-prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a> <a href="/" 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}
@ -71,9 +71,13 @@
</button> </button>
{/if} {/if}
<div id="change-theme" class="dropdown dropdown-end"> <div id="change-theme" class="dropdown dropdown-end">
<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
<div tabindex="0" class="btn btn-square btn-ghost"> <div tabindex="0" class="btn btn-square btn-ghost">
<span class="i-heroicons-outline-color-swatch" /> <span class="i-heroicons-outline-color-swatch" />
</div> </div>
<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
<ul <ul
tabindex="0" tabindex="0"
class="flex flex-nowrap shadow-2xl menu dropdown-content bg-base-100 text-base-content rounded-box w-52 p-2 gap-2 overflow-y-auto max-h-[21.5rem]" class="flex flex-nowrap shadow-2xl menu dropdown-content bg-base-100 text-base-content rounded-box w-52 p-2 gap-2 overflow-y-auto max-h-[21.5rem]"

View file

@ -21,7 +21,7 @@
{#each nav as { text, link, children }} {#each nav as { text, link, children }}
{#if link && !children} {#if link && !children}
<li> <li>
<a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a> <a class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{:else if children} {:else if children}
<li tabindex="0"> <li tabindex="0">
@ -32,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 data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a> <a class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{/each} {/each}
</ul> </ul>
@ -52,7 +52,7 @@
{#each nav as { text, link, children }} {#each nav as { text, link, children }}
{#if link && !children} {#if link && !children}
<li> <li>
<a data-sveltekit-prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a> <a class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{:else if children} {:else if children}
<li> <li>
@ -64,7 +64,7 @@
<ul tabindex="0" class="menu rounded-box bg-base-100 text-base-content shadow-lg p-2"> <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 data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a> <a class:font-bold={link === path} href={link}>{text}</a>
</li> </li>
{/each} {/each}
</ul> </ul>

View file

@ -6,7 +6,6 @@
<form <form
action={headerConfig?.search?.provider === 'duckduckgo' ? '//duckduckgo.com/' : '//google.com/search'} action={headerConfig?.search?.provider === 'duckduckgo' ? '//duckduckgo.com/' : '//google.com/search'}
method="get" method="get"
accept-charset="UTF-8"
class="flex-1"> class="flex-1">
<input <input
type="text" type="text"

View file

@ -40,7 +40,7 @@
{#if link} {#if link}
<a <a
href={link} href={link}
rel={rel ?? 'me noopener external'} rel={rel ?? 'me noopener noreferrer external'}
class:btn-square={!text} class:btn-square={!text}
class="btn btn-sm btn-ghost normal-case gap-2 u-url" class="btn btn-sm btn-ghost normal-case gap-2 u-url"
target="_blank"> target="_blank">
@ -52,7 +52,7 @@
{/if} {/if}
</a> </a>
{:else} {:else}
<button class:btn-square={!text} class="btn btn-sm btn-ghost normal-case gap-2" {rel}> <button class:btn-square={!text} class="btn btn-sm btn-ghost normal-case gap-2">
{#if icon} {#if icon}
<span class="{icon} !w-5 !h-5" /> <span class="{icon} !w-5 !h-5" />
{/if} {/if}

View file

@ -6,25 +6,12 @@
<div class="flex flex-wrap gap-2 rounded-box outline outline-neutral/10 p-4 {className}"> <div class="flex flex-wrap gap-2 rounded-box outline outline-neutral/10 p-4 {className}">
<span class="flex-none font-bold uppercase opacity-30">Reply to:&nbsp;</span> <span class="flex-none font-bold uppercase opacity-30">Reply to:&nbsp;</span>
{#if Array.isArray(in_reply_to)}
{#each in_reply_to as reply}
<a
href={reply}
rel="noopener external"
target="_blank"
class="flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to">
<span class="i-heroicons-outline-reply my-auto !w-4 !h-4" />
{reply}
</a>
{/each}
{:else}
<a <a
href={in_reply_to} href={in_reply_to}
rel="noopener external" rel="noopener noreferrer external"
target="_blank" target="_blank"
class="ml-auto flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to"> class="ml-auto flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to">
<span class="i-heroicons-outline-reply my-auto !w-4 !h-4" /> <span class="i-heroicons-outline-reply my-auto !w-4 !h-4" />
{in_reply_to} {in_reply_to}
</a> </a>
{/if}
</div> </div>