diff --git a/src/lib/components/lemmy/comment/CommentItem.svelte b/src/lib/components/lemmy/comment/CommentItem.svelte index a8d7d56e..bf8fa408 100644 --- a/src/lib/components/lemmy/comment/CommentItem.svelte +++ b/src/lib/components/lemmy/comment/CommentItem.svelte @@ -31,11 +31,7 @@ diff --git a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte index 0e1b593a..5eb59956 100644 --- a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte +++ b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte @@ -34,9 +34,6 @@ - diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 8598bc98..3784f907 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -3,15 +3,13 @@ import { isImage, isVideo } from '$lib/ui/image.js' import { getInstance } from '$lib/lemmy.js' import PostActions from '$lib/components/lemmy/post/PostActions.svelte' - import { settings } from '$lib/settings.svelte.js' + import { settings, type View } from '$lib/settings.svelte.js' import PostLink from '$lib/components/lemmy/post/link/PostLink.svelte' import PostMeta, { parseTags, type Tag, } from '$lib/components/lemmy/post/PostMeta.svelte' import { Badge, Material, toast } from 'mono-svelte' - import Markdown from '$lib/components/markdown/Markdown.svelte' - import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte' import { bestImageURL, mediaType, @@ -19,12 +17,7 @@ } from '$lib/components/lemmy/post/helpers.js' import Empty from '$lib/components/helper/Empty.svelte' import { publishedToDate } from '$lib/components/util/date.js' - import { - ArrowUp, - ChatBubbleOvalLeft, - Icon, - VideoCamera, - } from 'svelte-hero-icons' + import { ArrowUp, ChatBubbleOvalLeft, Icon } from 'svelte-hero-icons' import PostMedia from '$lib/components/lemmy/post/media/PostMedia.svelte' import PostMediaCompact from '$lib/components/lemmy/post/media/PostMediaCompact.svelte' import PostBody from './PostBody.svelte' @@ -58,7 +51,7 @@ post: PostView actions?: boolean hideCommunity?: boolean - view?: any + view?: View style?: string class?: string badges?: import('svelte').Snippet @@ -105,7 +98,6 @@ group {settings.leftAlign ? 'left-align' : ''} {view == 'compact' ? 'py-3 list-type compact' : ''} - {view == 'list' ? 'py-5 list-type' : ''} {view == 'cozy' ? 'py-5 flex flex-col gap-2' : ''} {clazz ?? ''}" id={post.post.id.toString()} @@ -152,10 +144,7 @@ {/snippet} {#key post.post.url} -
+
{#if rule != 'hide'} {/if}
- {#if view == 'list' || view == 'compact'} + {#if view == 'compact'} () function isOverflown(element: Element) { if (!element) return false - return ( - element.scrollHeight > element.clientHeight || - element.scrollWidth > element.clientWidth - ) + + return element.scrollHeight > MAX_HEIGHT } interface Props { @@ -34,7 +34,7 @@ let overflows = $derived(element ? isOverflown(element) : false) - let expanded = $state(true) + let expanded = $state(false) $effect(() => { expanded = !overflows }) @@ -46,8 +46,7 @@ class="{!expanded ? ` overflow-hidden bg-gradient-to-b text-transparent from-slate-600 via-slate-600 -dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0 -${view == 'list' ? `max-h-24` : 'max-h-48'}` +dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0 max-h-48` : 'text-slate-600 dark:text-zinc-400 max-h-full'} text-base {clazz}" class:pointer-events-none={!clickThrough} bind:this={element} diff --git a/src/lib/components/ui/navbar/commands/actions.svelte.ts b/src/lib/components/ui/navbar/commands/actions.svelte.ts index 9d30bc5d..530bcb28 100644 --- a/src/lib/components/ui/navbar/commands/actions.svelte.ts +++ b/src/lib/components/ui/navbar/commands/actions.svelte.ts @@ -349,14 +349,6 @@ export function getGroups( handle: () => settings.view = 'cozy' }, - { - name: t.get('nav.commands.setViewTo', { - default: t.get('filter.view.list'), - }), - icon: ViewColumns, - handle: () => - settings.view = 'list' - }, ], }, { diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts index a67bf8d7..48a42f11 100644 --- a/src/lib/settings.svelte.ts +++ b/src/lib/settings.svelte.ts @@ -8,7 +8,7 @@ import type { Link } from './components/ui/navbar/link' console.log('Using the following default settings from the environment:') console.log(env) -export type View = 'card' | 'cozy' | 'list' | 'compact' +export type View = 'cozy' | 'compact' export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true' @@ -148,7 +148,7 @@ export const defaultSettings: Settings = { debugInfo: toBool(env.PUBLIC_DEBUG_INFO) ?? false, expandImages: toBool(env.PUBLIC_EXPAND_IMAGES) ?? true, // @ts-ignore - view: env.PUBLIC_VIEW ?? 'cozy', + view: env.PUBLIC_VIEW ?? 'compact', // @ts-ignore font: env.PUBLIC_FONT ?? 'inter', leftAlign: toBool(env.PUBLIC_LEFT_ALIGN) ?? false, diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 31ff6d48..fd5ad079 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -264,14 +264,10 @@ {#snippet description()}

- {#if settings.view == 'list'} - {$t('settings.app.view.list')} - {:else if settings.view == 'cozy'} + {#if settings.view == 'cozy'} {$t('settings.app.view.cozy')} {:else if settings.view == 'compact'} {$t('settings.app.view.compact')} - {:else if settings.view == 'card'} - {$t('settings.app.view.legacy')} {/if}

{/snippet}