-
+
{title}
diff --git a/src/lib/ui/layout/CommonList.svelte b/src/lib/ui/layout/CommonList.svelte
index 2ba90749..9dbf8d20 100644
--- a/src/lib/ui/layout/CommonList.svelte
+++ b/src/lib/ui/layout/CommonList.svelte
@@ -54,6 +54,7 @@
transition: background-color 0.1s;
background-color: var(--color-white);
container-type: inline-size;
+ border: 1px solid var(--color-slate-100);
border-radius: var(--radius-md) var(--radius-md);
@@ -103,6 +104,7 @@
}
:global(.dark) ul > :global(li) {
+ border: 1px solid var(--color-zinc-900);
background-color: color-mix(
in oklab,
var(--color-zinc-925),
diff --git a/src/lib/ui/layout/pages/Tabs.svelte b/src/lib/ui/layout/pages/Tabs.svelte
index 96368cb3..844168ee 100644
--- a/src/lib/ui/layout/pages/Tabs.svelte
+++ b/src/lib/ui/layout/pages/Tabs.svelte
@@ -76,7 +76,7 @@
class={[
'rounded-full font-medium transition-colors duration-100 relative z-0 shrink-0 hover:text-slate-900 hover:dark:text-zinc-100',
selected
- ? 'text-primary-900 dark:text-primary-100'
+ ? 'tab-selected text-primary-900 dark:text-primary-100 hover:cursor-default'
: 'text-slate-500 dark:text-zinc-500',
]}
>
@@ -90,3 +90,17 @@
{/each}
{@render children?.()}
+
+
diff --git a/src/lib/ui/navbar/NavButton.svelte b/src/lib/ui/navbar/NavButton.svelte
index 2b37522e..938df4f9 100644
--- a/src/lib/ui/navbar/NavButton.svelte
+++ b/src/lib/ui/navbar/NavButton.svelte
@@ -71,7 +71,7 @@
:global {
.prefix {
@variant max-md {
- height: 100%;
+ height: 90%;
display: grid;
place-items: center;
aspect-ratio: 1 / 1;
@@ -119,12 +119,18 @@
}
}
}
+
+ @variant hover {
+ cursor: default;
+ }
}
- @variant max-md {
- .nav-btn-sm-primary .prefix {
+ .nav-btn-sm-primary .prefix {
+ @variant max-md {
background-color: var(--color-primary-900);
color: var(--color-slate-50);
+ border-radius: var(--radius-xl);
+ height: 80%;
@variant hover {
color: var(--color-slate-50);
diff --git a/src/lib/ui/navbar/Navbar.svelte b/src/lib/ui/navbar/Navbar.svelte
index 1bcd22c3..46ecf6f2 100644
--- a/src/lib/ui/navbar/Navbar.svelte
+++ b/src/lib/ui/navbar/Navbar.svelte
@@ -48,7 +48,7 @@
icon={Home}
href="/"
label={$t('nav.home')}
- class="logo border-0 md:rounded-full! md:w-10! md:h-10 md:px-0! text-primary-900! dark:text-primary-100! -order-1"
+ class="logo border-0 md:rounded-full! md:w-10! md:h-10 md:px-0! -order-1"
adaptive={false}
>
{#snippet customIcon()}
@@ -64,7 +64,14 @@
{/if}
{:else}
-
+
+
+
+
{/if}
{/snippet}
diff --git a/src/lib/ui/shared/button/Button.svelte b/src/lib/ui/shared/button/Button.svelte
index 654f3a37..03b80084 100644
--- a/src/lib/ui/shared/button/Button.svelte
+++ b/src/lib/ui/shared/button/Button.svelte
@@ -179,6 +179,10 @@
}
}
+ .no-hover:hover {
+ cursor: normal !important;
+ }
+
.btn-primary {
border: 1px solid transparent;
background-color: var(--color-primary-900);
diff --git a/src/lib/ui/shared/button/ButtonGroup.svelte b/src/lib/ui/shared/button/ButtonGroup.svelte
new file mode 100644
index 00000000..e6f66016
--- /dev/null
+++ b/src/lib/ui/shared/button/ButtonGroup.svelte
@@ -0,0 +1,50 @@
+
+
+
+ {@render children?.()}
+
+
+
diff --git a/src/lib/ui/shared/index.ts b/src/lib/ui/shared/index.ts
index 7d11b3d9..f237b2b3 100644
--- a/src/lib/ui/shared/index.ts
+++ b/src/lib/ui/shared/index.ts
@@ -1,33 +1,38 @@
// Reexport your entry components here
-export { default as Button } from './button/Button.svelte'
-export { buttonColor, buttonSize, buttonShadow } from './button/Button.svelte'
+export {
+ default as Button,
+ buttonColor,
+ buttonShadow,
+ buttonSize,
+} from './button/Button.svelte'
+export { default as ButtonGroup } from './button/ButtonGroup.svelte'
export { default as Spinner } from './loader/Spinner.svelte'
export { default as TextLoader } from './loader/TextLoader.svelte'
export { default as Material } from './materials/Material.svelte'
-export { default as Label } from './forms/Label.svelte'
export { default as FileInput } from './forms/FileInput.svelte'
-export { default as TextInput } from './forms/TextInput.svelte'
+export { default as Label } from './forms/Label.svelte'
export { default as TextArea } from './forms/TextArea.svelte'
-export { default as Select } from './forms/select/Select.svelte'
+export { default as TextInput } from './forms/TextInput.svelte'
export { default as Option } from './forms/select/Option.svelte'
+export { default as Select } from './forms/select/Select.svelte'
export { default as Switch } from './forms/Switch.svelte'
-export { default as Popover } from './popover/Popover.svelte'
-export { default as Menu } from './popover/Menu.svelte'
-export { default as MenuDivider } from './popover/MenuDivider.svelte'
-export { default as MenuButton } from './popover/MenuButton.svelte'
export { default as Disclosure } from './disclosure/Disclosure.svelte'
export { default as Expandable } from './disclosure/Expandable.svelte'
export { default as Modal } from './modal/Modal.svelte'
-export { modal, action } from './modal/modal.js'
export { default as ModalContainer } from './modal/ModalContainer.svelte'
+export { action, modal } from './modal/modal.js'
+export { default as Menu } from './popover/Menu.svelte'
+export { default as MenuButton } from './popover/MenuButton.svelte'
+export { default as MenuDivider } from './popover/MenuDivider.svelte'
+export { default as Popover } from './popover/Popover.svelte'
-export { toast, removeToast, toasts, toastColors } from './toast/toasts.js'
export { default as ToastContainer } from './toast/ToastContainer.svelte'
+export { removeToast, toast, toastColors, toasts } from './toast/toasts.js'
-export { default as Note } from './note/Note.svelte'
export { default as Badge } from './badge/Badge.svelte'
+export { default as Note } from './note/Note.svelte'
export { default as Search } from './search/Search.svelte'
diff --git a/src/lib/ui/shared/modal/Modal.svelte b/src/lib/ui/shared/modal/Modal.svelte
index 58e967f8..52352bbf 100644
--- a/src/lib/ui/shared/modal/Modal.svelte
+++ b/src/lib/ui/shared/modal/Modal.svelte
@@ -5,7 +5,7 @@
import Portal from 'mono-svelte/popover/Portal.svelte'
import type { Snippet } from 'svelte'
import { XMark } from 'svelte-hero-icons/dist'
- import { backOut } from 'svelte/easing'
+ import { expoOut } from 'svelte/easing'
import type { ClassValue } from 'svelte/elements'
import { fade, scale } from 'svelte/transition'
import { trapFocus } from 'trap-focus-svelte'
@@ -97,7 +97,7 @@
use:trapFocus={true}
transition:scale|global={{
start: 0.97,
- easing: backOut,
+ easing: expoOut,
duration: 300,
}}
class={[
diff --git a/src/lib/ui/sidebar/SidebarButton.svelte b/src/lib/ui/sidebar/SidebarButton.svelte
index 587df1ca..48b83447 100644
--- a/src/lib/ui/sidebar/SidebarButton.svelte
+++ b/src/lib/ui/sidebar/SidebarButton.svelte
@@ -23,7 +23,7 @@
...rest
}: Props = $props()
- let selected = $derived(page.url.pathname == href)
+ let selected = $derived(page.url.pathname.startsWith(href))
{:else}
-
- {#snippet item(item)}
-
- {/snippet}
+
+ {#each data.inbox.value as item}
+
+
+
+ {/each}
{/if}
{#if !(data.page == 1 && (data?.inbox?.value.length ?? 0) == 0)}
diff --git a/src/routes/inbox/+page.ts b/src/routes/inbox/+page.ts
index 00238266..1105ebae 100644
--- a/src/routes/inbox/+page.ts
+++ b/src/routes/inbox/+page.ts
@@ -19,7 +19,7 @@ export async function load({ url, fetch }) {
const client = getClient(undefined, fetch)
const page = Number(url.searchParams.get('page')) || 1
const unreadOnly: boolean =
- (url.searchParams.get('unreadOnly') || 'true') == 'true'
+ (url.searchParams.get('unreadOnly') || 'false') == 'true'
const params = {
limit: 20,
diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte
index 9b8eb981..1ab25b5b 100644
--- a/src/routes/inbox/InboxItem.svelte
+++ b/src/routes/inbox/InboxItem.svelte
@@ -9,7 +9,7 @@
import PrivateMessage from '$lib/feature/inbox/PrivateMessage.svelte'
import Avatar from '$lib/ui/generic/Avatar.svelte'
import { publishedToDate } from '$lib/ui/util/date'
- import { Button, Expandable } from 'mono-svelte'
+ import { Button, ButtonGroup, Expandable } from 'mono-svelte'
import RelativeDate from 'mono-svelte/util/RelativeDate.svelte'
import { Eye, EyeSlash } from 'svelte-hero-icons/dist'
@@ -22,7 +22,7 @@
let loading = $state(false)
async function markAsRead(isRead: boolean) {
- if (!profile.current?.jwt) return
+ if (isRead && item.read) return
loading = true
@@ -96,7 +96,7 @@
-
+
-
+
{/snippet}
{#snippet extended()}
-
+
-
+
{/snippet}
{#snippet content()}
{#if item.type == 'comment_reply' || item.type == 'person_mention'}
diff --git a/src/routes/inbox/messages/+page.svelte b/src/routes/inbox/messages/+page.svelte
index 1fea1cdd..69db4833 100644
--- a/src/routes/inbox/messages/+page.svelte
+++ b/src/routes/inbox/messages/+page.svelte
@@ -137,7 +137,10 @@
{/if}
{#snippet item(preview)}
-
+
{preview.user.name}
diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte
index f79cfb1c..d0759c31 100644
--- a/src/routes/post/[instance]/[id=integer]/+page.svelte
+++ b/src/routes/post/[instance]/[id=integer]/+page.svelte
@@ -16,6 +16,7 @@
PostMeta,
type Tag,
} from '$lib/feature/post'
+ import Fixate from '$lib/ui/generic/Fixate.svelte'
import Placeholder from '$lib/ui/info/Placeholder.svelte'
import { CommonList } from '$lib/ui/layout'
import EndPlaceholder from '$lib/ui/layout/EndPlaceholder.svelte'
@@ -214,13 +215,9 @@
{#await data.data.value.comments then comments}
{#if data.data.value.params.thread.showContext || data.data.value.params.thread.singleThread}
-
+
-
+
{/if}
{/await}