misc: Tweak design

This commit is contained in:
Xyphyn committed 2023-07-19 15:36:01 -07:00
1 parent 42a429326a
commit 4c3b5fae6a
10 files changed
+65 -24

No files matched your search

+14 -3
View File
@@ -57,14 +57,21 @@
buttonColor[color],
buttonSize[size],
buttonRoundness[rounded],
loading ? (color == 'primary' ? '!bg-transparent !text-inherit' : '') : '',
'text-sm transition-all disabled:opacity-70 disabled:pointer-events-none',
$$props.class
)
</script>
{#if href}
<a {href} {...$$restProps} class={buttonClass}>
<a
{href}
{...$$restProps}
class="{buttonClass} {loading
? color == 'primary'
? '!bg-transparent !text-inherit'
: ''
: ''}"
>
<div class="flex flex-row items-center justify-center gap-1.5">
{#if loading}
<Spinner />
@@ -79,7 +86,11 @@
disabled={loading}
{...$$restProps}
on:click={(e) => dispatch('click', e)}
class={buttonClass}
class="{buttonClass} {loading
? color == 'primary'
? '!bg-transparent !text-inherit'
: ''
: ''}"
type={submit ? 'submit' : 'button'}
>
<div class="flex flex-row items-center justify-center gap-1.5">
@@ -66,6 +66,7 @@
color="elevated"
size="sm"
href="/post/{getInstance()}/{post.post.id}"
class="px-3"
>
<Icon slot="icon" src={ChatBubbleOvalLeft} mini width={16} height={16} />
<FormattedNumber number={post.counts.comments} />
@@ -10,7 +10,7 @@
<!-- svelte-ignore a11y-missing-attribute -->
<img
src={thumbnail_url}
class="rounded-md max-h-[16rem] w-full aspect-[16/9] object-cover bg-slate-200 dark:bg-zinc-800"
class="rounded-md w-[500px] aspect-video object-cover bg-slate-200 dark:bg-zinc-800"
width={600}
height={400}
/>
+24 -11
View File
@@ -21,19 +21,25 @@
Plus,
UserCircle,
} from 'svelte-hero-icons'
import { get } from 'svelte/store'
let scrollY = 0
</script>
<svelte:window bind:scrollY />
<nav
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-50/80
lg:bg-white/80 lg:rounded-b-md
dark:bg-zinc-950/80 lg:dark:bg-zinc-900/80 backdrop-blur-3xl max-w-5xl
w-full mx-auto px-4 py-2 z-50 lg:border-x lg:border-b transition-all
border-slate-200 dark:border-zinc-800 box-border"
class="flex flex-row gap-2 items-center sticky top-0 bg-slate-100
dark:bg-black {scrollY > 0
? 'bg-slate-100/80 dark:bg-black/80'
: ''} backdrop-blur-3xl
w-full mx-auto px-4 py-2 z-50 border-b transition-all
border-slate-200 dark:border-zinc-900 box-border"
>
<div class="flex flex-row gap-2 items-center mr-auto">
<a href="/" class="flex flex-row items-center gap-2">
<Logo width={40} />
<span class="opacity-30 text-lg">/</span>
<span class="opacity-30 text-xl">/</span>
<span class="text-sm font-bold">
{$instance}
</span>
@@ -69,6 +75,11 @@
slot="button"
on:click={toggleOpen}
>
{#if $user === undefined}
<div class="w-full h-full grid place-items-center">
<Spinner width={20} />
</div>
{/if}
{#if $user}
<img
src={$user.person.avatar ??
@@ -86,11 +97,7 @@
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">
{$user ? $user.person.name : 'Profile'}
</li>
{#if !$user || !$authData}
<MenuButton link href="/login">
<Icon src={ArrowLeftOnRectangle} mini width={16} /> Log in
</MenuButton>
{:else}
{#if $user && $authData}
<MenuButton link href="/u/{$user.person.name}@{$authData.instance}">
<Icon src={UserCircle} mini width={16} /> Profile
</MenuButton>
@@ -118,6 +125,12 @@
<Icon src={ArrowRightOnRectangle} mini width={16} />Log out
</MenuButton>
{/if}
{#if !$user || !$authData}
<MenuButton link href="/login">
<Icon src={ArrowLeftOnRectangle} mini width={16} />
Log in
</MenuButton>
{/if}
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
<li class="text-xs px-4 py-1 my-1 opacity-80">App</li>
<MenuButton link href="/settings">
+2 -2
View File
@@ -1,8 +1,8 @@
<aside
class="sticky top-20 border bg-white border-slate-200
dark:border-zinc-800 dark:bg-zinc-900 break-words flex
flex-col gap-4 p-6 w-[20rem] rounded-md h-max max-h-[calc(100vh-6rem)]
overflow-auto"
flex-col gap-4 p-6 w-[22rem] rounded-md h-max max-h-[calc(100vh-6rem)]
overflow-auto text-sm"
>
<slot />
</aside>
+2 -2
View File
@@ -39,7 +39,7 @@
? ExclamationCircle
: ExclamationCircle}
/>
<div class="flex flex-col p-4 pl-0 mr-auto">
<div class="flex flex-col p-4 pl-0 break-words max-w-full">
{#if toast.title}
<h1 class="text-base font-bold">{toast.title}</h1>
{/if}
@@ -49,7 +49,7 @@
on:click={() => {
toasts.update((toasts) => toasts.filter((t) => t.id != toast.id))
}}
class="rounded-lg transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
class="rounded-lg ml-auto w-max transition-colors hover:bg-slate-200 hover:dark:bg-zinc-800 p-2 m-2"
>
<Icon src={XMark} size="16" mini />
</button>
+1 -1
View File
@@ -1,7 +1,7 @@
import { writable } from 'svelte/store'
export enum ToastType {
'error' = 'bg-red-500 text-black border border-red-600',
'error' = 'bg-red-500 text-white border border-red-600',
'warning' = 'bg-yellow-400 text-black border border-yellow-500',
'success' = 'bg-green-400 text-black border border-green-500',
'info' = 'dark:bg-zinc-900 bg-white border border-slate-200 dark:border-zinc-800 shadow-lg',
+12 -4
View File
@@ -47,7 +47,9 @@ export interface UserData {
}
export const authData = writable<AuthData | undefined>()
export const user = writable<(PersonView & UserData) | undefined>()
export const user = writable<(PersonView & UserData) | undefined | null>(
undefined
)
setInterval(async () => {
// check for unread messages
@@ -77,13 +79,18 @@ authData.subscribe(async (data) => {
instance.set(
data?.instance ?? get(userSettings).instance ?? DEFAULT_INSTANCE_URL
)
if (!data?.token) return
if (!data?.token) {
user.set(null)
return
}
try {
const site = await getClient().getSite({
auth: data.token,
})
if (!site?.my_user) throw Error('Missing user')
if (!site?.my_user) {
user.set(null)
throw Error('Missing user')
}
user.set({ ...site.my_user.local_user_view, unreads: 0 })
if (typeof localStorage != 'undefined') {
localStorage.setItem('user', JSON.stringify(data))
@@ -95,6 +102,7 @@ authData.subscribe(async (data) => {
})
console.error(error)
authData.set(undefined)
user.set(null)
}
})
+3
View File
@@ -12,6 +12,7 @@
DEFAULT_INSTANCE_URL,
authData,
getClient,
user,
validateInstance,
} from '$lib/lemmy.js'
import { Color } from '$lib/ui/colors.js'
@@ -38,6 +39,7 @@
})
if (response?.jwt) {
user.set(undefined)
authData.set({
instance: data.instance,
token: response.jwt,
@@ -54,6 +56,7 @@
content: error as any,
type: ToastType.error,
})
user.set(null)
}
data.loading = false
}
+5
View File
@@ -13,6 +13,11 @@
}
}
html,
body {
text-rendering: optimizeLegibility;
}
.wait * {
cursor: wait !important;
}