design: update Tabs, Material, Button

This commit is contained in:
Xylight committed 2026-07-10 14:37:20 -07:00
1 parent d902fe79bc
commit 308bdee650
3 files changed
+29 -38

No files matched your search

+12 -13
View File
@@ -28,9 +28,7 @@
let matchType = $derived<('search' | 'pathname')[]>( let matchType = $derived<('search' | 'pathname')[]>(
routes.map((i) => routes.map((i) =>
new URL(`https://example.com${i.href}`)?.search != '' new URL(`https://example.com${i.href}`)?.search != '' ? 'search' : 'pathname',
? 'search'
: 'pathname',
), ),
) )
@@ -42,9 +40,9 @@
// me on 2025/10/9: no shi buh // me on 2025/10/9: no shi buh
const usePathname = !routes.some( const usePathname = !routes.some(
(i) => (i) =>
new Set( new Set(new URL(`https://example.com${i.href}`).searchParams.values()).intersection(
new URL(`https://example.com${i.href}`).searchParams.values(), currentSearch,
).intersection(currentSearch).size > 0, ).size > 0,
) )
const hasSearchParam = hrefSearch.intersection(currentSearch).size > 0 const hasSearchParam = hrefSearch.intersection(currentSearch).size > 0
@@ -57,8 +55,8 @@
<nav <nav
class={[ class={[
'tab-bar', 'tab-bar rounded-full',
style == 'header' ? 'bar-header' : 'gap-2', style == 'header' ? 'bar-header material-distinct' : 'gap-2',
margin && 'my-2', margin && 'my-2',
margin && style == 'subpage' && 'mb-3', margin && style == 'subpage' && 'mb-3',
clazz, clazz,
@@ -92,6 +90,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-items: center;
flex-wrap: wrap; flex-wrap: wrap;
z-index: 20; z-index: 20;
@@ -101,11 +100,11 @@
} }
.tab-bar.bar-header { .tab-bar.bar-header {
padding: calc(var(--spacing)); padding: calc(var(--spacing) * 1.5);
gap: calc(var(--spacing) * 1) calc(var(--spacing) * 2); gap: calc(var(--spacing) * 1) calc(var(--spacing) * 2);
justify-content: center; justify-content: center;
margin-left: calc(var(--spacing) * -3); margin-left: auto;
margin-right: calc(var(--spacing) * -3); margin-right: auto;
margin-top: calc(var(--spacing) * -1); margin-top: calc(var(--spacing) * -1);
@variant sm { @variant sm {
@@ -143,7 +142,7 @@
} }
} }
padding: calc(var(--spacing)) calc(var(--spacing) * 3); padding: calc(var(--spacing)) calc(var(--spacing) * 3);
border-radius: var(--radius-xl); border-radius: 999px;
font-weight: var(--font-weight-medium); font-weight: var(--font-weight-medium);
transition: all cubic-bezier(0.075, 0.82, 0.165, 1) 75ms; transition: all cubic-bezier(0.075, 0.82, 0.165, 1) 75ms;
z-index: 0; z-index: 0;
@@ -154,7 +153,7 @@
background-color: var(--color-slate-100); background-color: var(--color-slate-100);
@variant dark { @variant dark {
color: var(--color-zinc-100); color: var(--color-zinc-100);
background-color: var(--color-zinc-800); background-color: var(--color-zinc-900);
} }
} }
} }
+6 -12
View File
@@ -196,22 +196,16 @@
} }
.btn-primary { .btn-primary {
border: 1px solid transparent; border: 1px solid var(--color-primary-900);
background: radial-gradient( background: linear-gradient(to bottom, var(--color-primary-800), var(--color-primary-900));
circle at 20% 0%, box-shadow: 0px 1.5px 0px 0px var(--color-slate-500) inset;
var(--color-primary-800),
var(--color-primary-900)
);
background-size: 110% 110% !important;
color: var(--color-slate-50); color: var(--color-slate-50);
@variant dark { @variant dark {
background: radial-gradient( border-color: var(--color-primary-200);
circle at center right, background: linear-gradient(to bottom, var(--color-primary-100), var(--color-primary-200));
var(--color-primary-200),
var(--color-primary-100)
);
color: var(--color-zinc-900); color: var(--color-zinc-900);
box-shadow: 0px 1.5px 0px 0px --alpha(var(--color-white) / 100%) inset;
} }
@variant hover { @variant hover {
+11 -13
View File
@@ -86,12 +86,7 @@
]} ]}
> >
{#if icon} {#if icon}
<Icon <Icon src={icon} size="20" mini class="inline-block rounded-lg clear-both float-left mr-2" />
src={icon}
size="20"
mini
class="inline-block rounded-lg clear-both float-left mr-2"
/>
{/if} {/if}
{@render children?.()} {@render children?.()}
</svelte:element> </svelte:element>
@@ -110,9 +105,11 @@
} }
@variant dark { @variant dark {
background-color: var(--color-zinc-900); background: var(--color-zinc-900);
border-color: var(--color-zinc-800); border-color: var(--color-zinc-950);
border-top-color: var(--color-zinc-700); box-shadow:
0px 1.5px 0px 0px inset var(--color-zinc-700),
0px -1px 0px 0px inset var(--color-zinc-950);
@variant hover { @variant hover {
background-color: var(--color-zinc-925); background-color: var(--color-zinc-925);
@@ -132,18 +129,19 @@
} }
.material-distinct { .material-distinct {
background-color: white; background-color: --alpha(var(--color-slate-50) / 70%);
border-width: 1px; border-width: 1px;
border-color: var(--color-slate-200); border-color: var(--color-slate-200);
box-shadow: 0px 1.5px 0px 0px --alpha(var(--color-white) / 90%) inset;
@variant not-dark { @variant not-dark {
border-bottom-color: var(--color-slate-300); border-bottom-color: var(--color-slate-300);
} }
@variant dark { @variant dark {
background-color: var(--color-zinc-925); background-color: --alpha(var(--color-zinc-925) / 70%);
border-color: var(--color-zinc-800); border-color: --alpha(var(--color-black) / 30%);
border-top-color: var(--color-zinc-700); box-shadow: 0px 1.5px 0px 0px --alpha(var(--color-zinc-800) / 80%) inset;
} }
} }