From e55d8abfa7f1602ce57927c3d3ed0923f08aaa15 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sat, 27 Sep 2025 10:16:42 -0700 Subject: [PATCH] design: make disabled buttons not look like buns --- src/lib/app/settings.svelte.ts | 2 +- src/lib/ui/shared/button/Button.svelte | 4 ++-- .../(local_user)/password/change/+page.svelte | 4 ++-- src/routes/search/+page.svelte | 2 -- src/routes/signup/[instance]/+page.svelte | 21 +++++++++++-------- src/routes/signup/[instance]/+page.ts | 7 ++++--- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/lib/app/settings.svelte.ts b/src/lib/app/settings.svelte.ts index 7a7263c3..4cb98d11 100644 --- a/src/lib/app/settings.svelte.ts +++ b/src/lib/app/settings.svelte.ts @@ -224,7 +224,7 @@ function isObject(item: object) { * @param ...sources */ -function mergeDeep(target: any, ...sources: any[]) { +export function mergeDeep(target: any, ...sources: any[]) { if (!sources.length) return target const source = sources.shift() diff --git a/src/lib/ui/shared/button/Button.svelte b/src/lib/ui/shared/button/Button.svelte index 0f66aac5..654f3a37 100644 --- a/src/lib/ui/shared/button/Button.svelte +++ b/src/lib/ui/shared/button/Button.svelte @@ -315,11 +315,11 @@ .btn-disabled { pointer-events: none; - filter: brightness(90%); + opacity: 0.6; cursor: normal; @variant dark { - filter: brightness(70%); + opacity: 0.5; } } } diff --git a/src/routes/profile/(local_user)/password/change/+page.svelte b/src/routes/profile/(local_user)/password/change/+page.svelte index 7efc50f0..69d13891 100644 --- a/src/routes/profile/(local_user)/password/change/+page.svelte +++ b/src/routes/profile/(local_user)/password/change/+page.svelte @@ -19,9 +19,9 @@ old_password: oldPassword, }) if (res?.jwt) { - const { instance } = profile.current + const { instance, client } = profile.current profile.remove(profile.current.id) - await profile.add(res.jwt, instance) + await profile.add(res.jwt, instance, client) toast({ content: $t('toast.loginRefresh'), type: 'success' }) } else { diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte index 3226926a..091f738b 100644 --- a/src/routes/search/+page.svelte +++ b/src/routes/search/+page.svelte @@ -1,7 +1,6 @@