From e61d77f46eb239a7cf245e46bf7e602488f76cbc Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 21 Sep 2025 16:12:53 -0700 Subject: [PATCH 01/29] refactor: use native css w/ tailwindcss restrictions --- bun.lockb | Bin 186370 -> 186322 bytes package.json | 3 +- postcss.config.js | 5 - src/{style => }/app.css | 0 src/lib/components/ui/navbar/NavButton.svelte | 63 +++++- src/lib/mono/button/Button.svelte | 202 ++++++++++++++++-- src/lib/mono/forms/select/Select.svelte | 17 +- src/lib/mono/popover/MenuButton.svelte | 3 +- src/routes/+layout.svelte | 2 +- src/routes/accounts/+page.svelte | 16 +- src/routes/inbox/+page.svelte | 3 +- vite.config.ts | 3 +- 12 files changed, 251 insertions(+), 66 deletions(-) delete mode 100644 postcss.config.js rename src/{style => }/app.css (100%) diff --git a/bun.lockb b/bun.lockb index ffd0b54b86f27732a80f776ab6541bb851228bd6..8b14e6b3fb8ad17bb17a9d7d264fb3ed3c7057aa 100755 GIT binary patch delta 26750 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 c=!B@X{Rw{LA9CwPk~yC + + diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index 0f166587..42a3fa9a 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -10,19 +10,14 @@ } export const buttonColor = { - primary: `border border-transparent bg-primary-900 text-slate-50 dark:bg-primary-100 dark:text-black`, - secondary: `border border-slate-200 border-b-slate-300 dark:border-zinc-800 bg-white dark:bg-zinc-900`, - tertiary: - ' bg-transparent hover:bg-slate-200/50 dark:hover:bg-zinc-700/30 dark:text-zinc-200', - - danger: - 'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white', + primary: 'btn-primary', + secondary: 'btn-secondary', + tertiary: 'btn-tertiary', + danger: 'btn-danger', + ghost: 'btn-ghost', 'danger-subtle': 'text-red-500 hover:bg-red-500 hover:text-inherit!', 'success-subtle': 'text-green-500 hover:bg-green-500 hover:text-inherit!', 'warning-subtle': 'text-yellow-500 hover:bg-yellow-500 hover:text-inherit!', - ghost: `border border-slate-200 dark:border-zinc-800 bg-transparent - hover:bg-slate-100 dark:hover:bg-zinc-800 dark:hover:border-zinc-700 dark:text-zinc-400 hover:text-inherit - dark:hover:text-inherit`, 'blue-subtle': `text-blue-500 hover:bg-blue-500 hover:text-inherit!`, none: '', @@ -36,15 +31,15 @@ export type ButtonSize = keyof typeof buttonSize export const buttonSize = { - xs: 'px-2 py-1 text-xs', - sm: 'px-3 py-1.5 text-[12px]', - md: 'px-3 py-1.5 text-sm', - lg: 'px-4 py-2 text-sm', - xl: 'px-6 py-3 text-base', - 'square-sm': 'w-6 h-6', - 'square-md': 'w-8 h-8', - 'square-lg': 'w-10 h-10', - 'square-xl': 'w-12 h-12', + xs: 'btn-xs', + sm: 'btn-sm', + md: 'btn-md', + lg: 'btn-lg', + xl: 'btn-xl', + 'square-sm': 'btn-square-sm', + 'square-md': 'btn-square-md', + 'square-lg': 'btn-square-lg', + 'square-xl': 'btn-square-xl', custom: '', } @@ -61,6 +56,7 @@ extends Omit { loading?: boolean submit?: boolean + type?: 'button' | 'none' color?: ButtonColor size?: ButtonSize rounding?: ButtonRoundness @@ -93,6 +89,7 @@ let { loading = false, submit = false, + type = 'button', color = 'secondary', size = 'md', rounding = 'xl', @@ -117,15 +114,13 @@ {...rest} tabindex={disabled ? -1 : undefined} class={[ + type == 'button' && 'btn', buttonSize[size], buttonRounding[rounding], buttonShadow[shadow], buttonColor[color], buttonAlignment[alignment], - 'transition-all font-medium cursor-pointer disabled:opacity-50 disabled:pointer-events-none', - 'hover:brightness-98 hover:dark:brightness-95 active:brightness-90 active:dark:brightness-85 text-sm', - 'flex flex-row items-center gap-1.5', - (disabled || loading) && 'pointer-events-none opacity-50 shadow-none', + (disabled || loading) && 'btn-disabled', alignment == 'center' ? 'origin-center' : alignment == 'left' @@ -157,3 +152,164 @@ @slot `prefix` -- Will be replaced if `loading` is `true`. @slot `suffix` --> + + diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index abeb385e..bbcfb160 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -3,8 +3,7 @@ value?: T | string | undefined placeholder?: string | undefined label?: string | undefined - size?: ButtonSize - shadow?: ButtonShadow + size?: 'md' | 'sm' id?: string class?: ClassValue baseClass?: ClassValue @@ -35,7 +34,7 @@ {#if $modals.reporting.open} - {#await import('$lib/components/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} + {#await import('$comp/lemmy/moderation/ReportModal.svelte') then { default: ReportModal }} {/await} {/if} diff --git a/src/lib/components/lemmy/moderation/RemoveModal.svelte b/src/lib/components/lemmy/moderation/RemoveModal.svelte index c859fad2..0deb8ef4 100644 --- a/src/lib/components/lemmy/moderation/RemoveModal.svelte +++ b/src/lib/components/lemmy/moderation/RemoveModal.svelte @@ -1,12 +1,12 @@ {#if uploadingImage} - {#await import('$lib/components/form/ImageInputModal.svelte') then { default: UploadModal }} + {#await import('$comp/form/ImageInputModal.svelte') then { default: UploadModal }} '', (v) => (data.url = v)} diff --git a/src/lib/components/lemmy/post/index.ts b/src/lib/components/lemmy/post/index.ts index 782db59f..280dd095 100644 --- a/src/lib/components/lemmy/post/index.ts +++ b/src/lib/components/lemmy/post/index.ts @@ -8,9 +8,6 @@ export { default as PostMediaCompact } from './media/PostMediaCompact.svelte' export { default as PostImage } from './media/PostImage.svelte' export { default as PostIframe } from './media/PostIframe.svelte' export { default as PostLink } from './link/PostLink.svelte' -export { default as VirtualFeed } from './feed/VirtualFeed.svelte' -export { default as PostFeed } from './feed/PostFeed.svelte' -export { default as PostForm } from './form/PostForm.svelte' export { default as PostActions } from './actions/PostActions.svelte' export { diff --git a/src/lib/components/lemmy/post/link/PostLink.svelte b/src/lib/components/lemmy/post/link/PostLink.svelte index 232e8ed3..e4786ef8 100644 --- a/src/lib/components/lemmy/post/link/PostLink.svelte +++ b/src/lib/components/lemmy/post/link/PostLink.svelte @@ -1,5 +1,5 @@ - - - + + diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index fd1c5fce..919dde0d 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -1,6 +1,6 @@ + +{#if type} + {#if renderers[type]} + {@const Renderer = renderers[type]} + + {#each tokens as token} + {#if token.tokens && token.tokens.length > 0} + + {:else if token.text} + {decodeHtmlEntities(token.text)} + {:else if text} + {text} + {/if} + {/each} + + {/if} +{:else} + {#each tokens as token} + + {/each} +{/if} diff --git a/src/lib/components/markdown/renderers/MdImage.svelte b/src/lib/components/markdown/renderers/MdImage.svelte index 7b75d742..7e74386b 100644 --- a/src/lib/components/markdown/renderers/MdImage.svelte +++ b/src/lib/components/markdown/renderers/MdImage.svelte @@ -4,8 +4,8 @@ mediaType, optimizeImageURL, PostIframe, - } from '$lib/components/lemmy/post' - import { showImage } from '$lib/components/ui/ExpandableImage.svelte' + } from '$comp/lemmy/post' + import { showImage } from '$comp/ui/ExpandableImage.svelte' import { t } from '$lib/i18n/translations' import { getContext } from 'svelte' import { ArrowDownTray, Icon } from 'svelte-hero-icons' diff --git a/src/lib/components/markdown/renderers/MdParagraph.svelte b/src/lib/components/markdown/renderers/MdParagraph.svelte index fb102bc6..9ede12d0 100644 --- a/src/lib/components/markdown/renderers/MdParagraph.svelte +++ b/src/lib/components/markdown/renderers/MdParagraph.svelte @@ -1,15 +1,8 @@ -

+

{@render children?.()}

diff --git a/src/lib/components/markdown/renderers/MdSpoiler.svelte b/src/lib/components/markdown/renderers/MdSpoiler.svelte index ed6fe266..d8c22550 100644 --- a/src/lib/components/markdown/renderers/MdSpoiler.svelte +++ b/src/lib/components/markdown/renderers/MdSpoiler.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index 1367c853..1183d145 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/c/[name]/settings/team/+page.svelte b/src/routes/c/[name]/settings/team/+page.svelte index bc91286c..fad1b673 100644 --- a/src/routes/c/[name]/settings/team/+page.svelte +++ b/src/routes/c/[name]/settings/team/+page.svelte @@ -1,9 +1,9 @@ diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index dd730541..4a3469ee 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/instances/blocked/+page.svelte b/src/routes/instances/blocked/+page.svelte index 0fd57d7f..6d3c6b22 100644 --- a/src/routes/instances/blocked/+page.svelte +++ b/src/routes/instances/blocked/+page.svelte @@ -1,8 +1,8 @@
diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 8e5383be..c54afdc7 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -3,15 +3,14 @@ import { page } from '$app/state' import { profile } from '$lib/auth.svelte.js' import { client } from '$lib/client/lemmy.svelte' - import { CommunityLink } from '$lib/components/lemmy/community' - import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js' - import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.svelte' - import { postLink } from '$lib/components/lemmy/post' - import UserAutocomplete from '$lib/components/lemmy/user/UserAutocomplete.svelte' - import UserLink from '$lib/components/lemmy/user/UserLink.svelte' - import { Header } from '$lib/components/ui/layout' - import Pageination from '$lib/components/ui/layout/Pageination.svelte' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import { isAdmin } from '$comp/lemmy/moderation/moderation.js' + import ObjectAutocomplete from '$comp/lemmy/ObjectAutocomplete.svelte' + import { postLink } from '$comp/lemmy/post' + import UserAutocomplete from '$comp/lemmy/user/UserAutocomplete.svelte' + import UserLink from '$comp/lemmy/user/UserLink.svelte' + import { Header } from '$comp/ui/layout' + import Pageination from '$comp/ui/layout/Pageination.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' import { t } from '$lib/i18n/translations' import { settings } from '$lib/settings.svelte.js' import { searchParam } from '$lib/util.svelte.js' @@ -27,6 +26,7 @@ } from 'svelte-hero-icons' import ModlogItemCard from './item/ModlogItemCard.svelte' import ModlogItemTable from './item/ModlogItemTable.svelte' + import CommunityLink from '$comp/lemmy/community/CommunityLink.svelte' let { data = $bindable() } = $props() diff --git a/src/routes/modlog/+page.ts b/src/routes/modlog/+page.ts index 8bd45208..d69a6416 100644 --- a/src/routes/modlog/+page.ts +++ b/src/routes/modlog/+page.ts @@ -18,7 +18,7 @@ import type { ModlogActionType, Person, } from '$lib/client/types' -import { publishedToDate } from '$lib/components/util/date.js' +import { publishedToDate } from '$comp/util/date.js' export type ActionName = | 'ban' diff --git a/src/routes/modlog/item/ModlogItemCard.svelte b/src/routes/modlog/item/ModlogItemCard.svelte index a6e3992e..8451363b 100644 --- a/src/routes/modlog/item/ModlogItemCard.svelte +++ b/src/routes/modlog/item/ModlogItemCard.svelte @@ -1,11 +1,11 @@ diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte index b12a56eb..f58853c0 100644 --- a/src/routes/profile/(local_user)/password/2fa/+page.svelte +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -7,7 +7,7 @@ import { Button, Material, Modal, TextInput, toast } from 'mono-svelte' import { ClipboardDocument, Icon, Key } from 'svelte-hero-icons' import { errorMessage } from '$lib/lemmy/error.js' - import Placeholder from '$lib/components/ui/Placeholder.svelte' + import Placeholder from '$comp/ui/Placeholder.svelte' let { data } = $props() diff --git a/src/routes/profile/(local_user)/password/logins/+page.svelte b/src/routes/profile/(local_user)/password/logins/+page.svelte index 326adc2a..e4b25d47 100644 --- a/src/routes/profile/(local_user)/password/logins/+page.svelte +++ b/src/routes/profile/(local_user)/password/logins/+page.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/profile/voted/[type]/+page.svelte b/src/routes/profile/voted/[type]/+page.svelte index e68e2c1f..b545a875 100644 --- a/src/routes/profile/voted/[type]/+page.svelte +++ b/src/routes/profile/voted/[type]/+page.svelte @@ -1,8 +1,8 @@ diff --git a/src/routes/settings/lemmy/+page.svelte b/src/routes/settings/lemmy/+page.svelte index c52343e4..ab32ad2e 100644 --- a/src/routes/settings/lemmy/+page.svelte +++ b/src/routes/settings/lemmy/+page.svelte @@ -15,7 +15,7 @@ } from 'svelte-hero-icons' import Setting from '../Setting.svelte' import ToggleSetting from '../ToggleSetting.svelte' - import CommonList from '$lib/components/ui/layout/CommonList.svelte' + import CommonList from '$comp/ui/layout/CommonList.svelte' diff --git a/src/routes/settings/moderation/+page.svelte b/src/routes/settings/moderation/+page.svelte index 64622e6b..c7689390 100644 --- a/src/routes/settings/moderation/+page.svelte +++ b/src/routes/settings/moderation/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/settings/other/+page.svelte b/src/routes/settings/other/+page.svelte index 46ac70a5..9ea747b1 100644 --- a/src/routes/settings/other/+page.svelte +++ b/src/routes/settings/other/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 14bb94b9..2548b0f1 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -1,15 +1,15 @@ {#if type} @@ -29,12 +44,60 @@ {@const Renderer = renderers[type]} {#each tokens as token} - {#if token.tokens && token.tokens.length > 0} - - {:else if token.text} - {decodeHtmlEntities(token.text)} - {:else if text} - {text} + {#if type != 'list' && type != 'table'} + {#if token.tokens && token.tokens.length > 0} + + {:else if token.text} + {decodeHtmlEntities(token.text)} + {:else if text} + {text} + {/if} + {:else if type == 'list' && token.items} + {#each token.items as item} + + {/each} + {:else if type == 'table'} + {@const THead = renderers['tablehead']} + {@const TBody = renderers['tablebody']} + {@const TRow = renderers['tablerow']} + {#if token.header} + + + {#each token.header as heading, index} + + {/each} + + + + {/if} + {#if token.rows} + + {#each token.rows as row} + + {#each row as cell, index} + + {/each} + + {/each} + + {/if} + {console.log($state.snapshot(token))} {/if} {/each} diff --git a/src/lib/components/markdown/renderers/MdList.svelte b/src/lib/components/markdown/renderers/MdList.svelte index 9f1cc376..a0417e60 100644 --- a/src/lib/components/markdown/renderers/MdList.svelte +++ b/src/lib/components/markdown/renderers/MdList.svelte @@ -9,16 +9,11 @@ {#if ordered} -
    +
      {@render children?.()}
    {:else} -
      +
        {@render children?.()}
      {/if} diff --git a/src/lib/components/markdown/renderers/MdListItem.svelte b/src/lib/components/markdown/renderers/MdListItem.svelte index 53919575..28444c16 100644 --- a/src/lib/components/markdown/renderers/MdListItem.svelte +++ b/src/lib/components/markdown/renderers/MdListItem.svelte @@ -5,3 +5,13 @@
    • {@render children?.()}
    • + + diff --git a/src/lib/components/markdown/renderers/index.ts b/src/lib/components/markdown/renderers/index.ts deleted file mode 100644 index 35d89ce4..00000000 --- a/src/lib/components/markdown/renderers/index.ts +++ /dev/null @@ -1,41 +0,0 @@ -import MdHeading from './MdHeading.svelte' -import MdImage from './MdImage.svelte' -import MdLink from './MdLink.svelte' -import MdQuote from './MdQuote.svelte' -import MdHr from './MdHr.svelte' -import MdCode from './MdCode.svelte' -import MdHtml from './MdHtml.svelte' -import MdList from './MdList.svelte' -import MdSpoiler from './MdSpoiler.svelte' -import MdTable from './table/MdTable.svelte' -import MdTableBody from './table/MdTableBody.svelte' -import MdTableCell from './table/MdTableCell.svelte' -import MdTableHead from './table/MdTableHead.svelte' -import MdTableRow from './table/MdTableRow.svelte' -import MdParagraph from './MdParagraph.svelte' -import MdListItem from './MdListItem.svelte' -import MdSubscript from './MdSubscript.svelte' -import MdSuperscript from './MdSuperscript.svelte' -import MdText from './MdText.svelte' - -export { - MdCode, - MdHeading, - MdHr, - MdHtml, - MdImage, - MdLink, - MdQuote, - MdList, - MdSpoiler, - MdTable, - MdTableBody, - MdTableCell, - MdTableHead, - MdTableRow, - MdParagraph, - MdListItem, - MdSubscript, - MdSuperscript, - MdText, -} diff --git a/src/lib/components/markdown/renderers/subtext/MdCodespan.svelte b/src/lib/components/markdown/renderers/subtext/MdCodespan.svelte new file mode 100644 index 00000000..5cbaefd5 --- /dev/null +++ b/src/lib/components/markdown/renderers/subtext/MdCodespan.svelte @@ -0,0 +1,11 @@ + + +{@render children?.()} diff --git a/src/lib/components/markdown/renderers/subtext/MdDel.svelte b/src/lib/components/markdown/renderers/subtext/MdDel.svelte new file mode 100644 index 00000000..382b599e --- /dev/null +++ b/src/lib/components/markdown/renderers/subtext/MdDel.svelte @@ -0,0 +1,11 @@ + + +{@render children?.()} diff --git a/src/lib/components/markdown/renderers/subtext/MdEm.svelte b/src/lib/components/markdown/renderers/subtext/MdEm.svelte new file mode 100644 index 00000000..bd5d8a01 --- /dev/null +++ b/src/lib/components/markdown/renderers/subtext/MdEm.svelte @@ -0,0 +1,11 @@ + + +{@render children?.()} diff --git a/src/lib/components/markdown/renderers/subtext/MdStrong.svelte b/src/lib/components/markdown/renderers/subtext/MdStrong.svelte new file mode 100644 index 00000000..bd11cea7 --- /dev/null +++ b/src/lib/components/markdown/renderers/subtext/MdStrong.svelte @@ -0,0 +1,11 @@ + + +{@render children?.()} diff --git a/src/lib/components/markdown/renderers/table/MdTable.svelte b/src/lib/components/markdown/renderers/table/MdTable.svelte index c8e28163..e322ab16 100644 --- a/src/lib/components/markdown/renderers/table/MdTable.svelte +++ b/src/lib/components/markdown/renderers/table/MdTable.svelte @@ -1,13 +1,48 @@ - - - {@render children?.()} -
      +
      + + {@render children?.()} +
      +
      + + diff --git a/src/lib/components/markdown/renderers/table/MdTableCell.svelte b/src/lib/components/markdown/renderers/table/MdTableCell.svelte index 67afbcfc..24c64e4f 100644 --- a/src/lib/components/markdown/renderers/table/MdTableCell.svelte +++ b/src/lib/components/markdown/renderers/table/MdTableCell.svelte @@ -9,17 +9,11 @@ {#if header} - + {@render children?.()} {:else} - + {@render children?.()} {/if} diff --git a/src/lib/components/markdown/renderers/table/MdTableHead.svelte b/src/lib/components/markdown/renderers/table/MdTableHead.svelte index cf987326..27b03408 100644 --- a/src/lib/components/markdown/renderers/table/MdTableHead.svelte +++ b/src/lib/components/markdown/renderers/table/MdTableHead.svelte @@ -1,10 +1,4 @@ - diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index c54afdc7..2f5e4be9 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -286,6 +286,11 @@ border: 1px solid var(--color-slate-200); background-color: white; border-radius: var(--radius-2xl); + + @variant dark { + background-color: var(--color-zinc-950); + border: 1px solid var(--color-zinc-800); + } } .table { @@ -299,6 +304,11 @@ font-weight: var(--font-weight-medium); font-size: var(--text-sm); background-color: var(--color-slate-25); + + @variant dark { + background-color: var(--color-zinc-900); + border-bottom: 1px solid var(--color-zinc-800); + } } } } @@ -310,16 +320,4 @@ padding: calc(var(--spacing) * 1) calc(var(--spacing) * 3); } } - - :global(.dark) { - .table-container { - background-color: var(--color-zinc-950); - border: 1px solid var(--color-zinc-800); - } - - thead tr th { - background-color: var(--color-zinc-900); - border-bottom: 1px solid var(--color-zinc-800); - } - } From 15581e7b07fb1f3fd99b4152aae89ec68d6758b0 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 22 Sep 2025 21:06:16 -0700 Subject: [PATCH 06/29] fix?: remove useless $state.snapshot --- .../lemmy/community/CommunityItem.svelte | 204 +++++++++--------- src/lib/components/markdown/MdTree.svelte | 2 - .../ui/sidebar/SidebarButton.svelte | 2 +- src/lib/i18n/translations.ts | 5 - src/lib/lemmy/feeds/feed.svelte.ts | 5 +- src/lib/mono/button/Button.svelte | 10 +- src/lib/mono/forms/select/Select.svelte | 6 +- src/routes/inbox/+page.svelte | 2 +- src/routes/login/+page.svelte | 2 +- src/routes/login/guest/+page.svelte | 2 +- src/routes/settings/ToggleSetting.svelte | 2 +- src/routes/settings/app/+page.svelte | 2 - 12 files changed, 125 insertions(+), 119 deletions(-) diff --git a/src/lib/components/lemmy/community/CommunityItem.svelte b/src/lib/components/lemmy/community/CommunityItem.svelte index be642f95..53c3368d 100644 --- a/src/lib/components/lemmy/community/CommunityItem.svelte +++ b/src/lib/components/lemmy/community/CommunityItem.svelte @@ -20,12 +20,14 @@ import { SvelteURL } from 'svelte/reactivity' import Subscribe from '../../../../routes/communities/Subscribe.svelte' import CommunityCard from './CommunityCard.svelte' + import type { Snippet } from 'svelte' interface Props { community: CommunityView view?: 'cozy' | 'compact' showCounts?: boolean resolveObject?: boolean + children?: Snippet } let { @@ -33,6 +35,7 @@ view = 'compact', showCounts = true, resolveObject, + children, }: Props = $props() @@ -52,104 +55,111 @@ : ''}" orientation={view == 'cozy' ? 'vertical' : 'horizontal'} > - {#if community.community.deleted} - - {/if} - {#if community.community.nsfw} - - {/if} - {#if community.banned_from_community} - - {/if} - {#if community.community.visibility == 'LocalOnly'} - - {/if} - - - {#snippet children({ subscribe, subscribing })} - {@const subscribed = - community.subscribed == 'Subscribed' || - community.subscribed == 'Pending'} - + + {#snippet children({ subscribe, subscribing })} + {@const subscribed = + community.subscribed == 'Subscribed' || + community.subscribed == 'Pending'} + - {/snippet} - + community.subscribed = newSubscribed + addSubscription( + community.community, + newSubscribed == 'Subscribed', + ) + } + }} + size="custom" + title={subscribed + ? $t('cards.community.subscribed') + : $t('cards.community.subscribe')} + color={subscribed ? 'secondary' : 'primary'} + rounding="xl" + class={[ + subscribed && 'text-slate-600 dark:text-zinc-400', + ' h-8.5 rounded-full', + view == 'compact' + ? 'aspect-square @md:px-2 @md:min-w-30 @md:aspect-auto' + : 'px-3', + ]} + icon={subscribed ? Check : Plus} + > + + {#if subscribed} + {$t('cards.community.subscribed')} + {:else} + {$t('cards.community.subscribe')} + {/if} + + + {/snippet} + + {:else} + {@render children?.()} + {/if} diff --git a/src/lib/components/markdown/MdTree.svelte b/src/lib/components/markdown/MdTree.svelte index a7938992..fc546376 100644 --- a/src/lib/components/markdown/MdTree.svelte +++ b/src/lib/components/markdown/MdTree.svelte @@ -35,7 +35,6 @@ if (header) { type = 'tablecell' - console.log(type) } @@ -97,7 +96,6 @@ {/each} {/if} - {console.log($state.snapshot(token))} {/if} {/each} diff --git a/src/lib/components/ui/sidebar/SidebarButton.svelte b/src/lib/components/ui/sidebar/SidebarButton.svelte index 56468597..587df1ca 100644 --- a/src/lib/components/ui/sidebar/SidebarButton.svelte +++ b/src/lib/components/ui/sidebar/SidebarButton.svelte @@ -32,8 +32,8 @@ rounding="xl" {...rest} {href} + weight="none" class={[ - 'font-normal block', 'hover:text-slate-900 hover:dark:text-zinc-50', selected ? 'text-primary-900 dark:text-primary-100' diff --git a/src/lib/i18n/translations.ts b/src/lib/i18n/translations.ts index 61f35d20..dacf4204 100644 --- a/src/lib/i18n/translations.ts +++ b/src/lib/i18n/translations.ts @@ -97,11 +97,6 @@ const config: Config = { key: '', loader: async () => (await import('./zh-Hant.json')).default, }, - { - locale: 'tok', - key: '', - loader: async () => (await import('./tok.json')).default, - }, ], fallbackLocale: 'en', } diff --git a/src/lib/lemmy/feeds/feed.svelte.ts b/src/lib/lemmy/feeds/feed.svelte.ts index 4a2e642c..18331c10 100644 --- a/src/lib/lemmy/feeds/feed.svelte.ts +++ b/src/lib/lemmy/feeds/feed.svelte.ts @@ -32,8 +32,9 @@ export class Feed { this.#lastParams && params && !recursiveEqual(params, this.#lastParams) - ) + ) { this.#data = undefined + } this.#lastParams = params if (this.#data == null) this.#data = await this.#fetch(params) @@ -56,7 +57,7 @@ export interface FeedTypes { { posts: PostView[] next_page?: string - params: GetPostss & { page_cursor: string } + params: GetPosts & { page_cursor: string } client: { itemHeights?: (number | null)[] lastSeen?: number diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index 42a3fa9a..b91d0b0e 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -52,6 +52,12 @@ } type ButtonRoundness = keyof typeof buttonRounding + const buttonWeight = { + md: 'font-medium', + none: '', + } + type ButtonWeight = keyof typeof buttonWeight + interface Props extends Omit { loading?: boolean @@ -70,6 +76,7 @@ suffix?: Snippet onclick?: HTMLButtonAttributes['onclick'] icon?: IconSource + weight?: ButtonWeight } export type { Props as ButtonProps } @@ -103,6 +110,7 @@ children, suffix, icon, + weight = 'md', ...rest }: Props = $props() @@ -120,6 +128,7 @@ buttonShadow[shadow], buttonColor[color], buttonAlignment[alignment], + buttonWeight[weight], (disabled || loading) && 'btn-disabled', alignment == 'center' ? 'origin-center' @@ -163,7 +172,6 @@ align-items: center; font-size: var(--text-sm); gap: calc(var(--spacing) * 1.5); - font-weight: var(--font-weight-medium); transition: 75ms linear; diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index bbcfb160..099d4cb5 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -43,11 +43,7 @@ } from 'svelte-hero-icons' import type { Attachment } from 'svelte/attachments' import type { ClassValue, HTMLSelectAttributes } from 'svelte/elements' - import { - buttonColor, - buttonShadow, - buttonSize, - } from '../../button/Button.svelte' + import { buttonSize } from '../../button/Button.svelte' import Menu from '../../popover/Menu.svelte' import MenuButton from '../../popover/MenuButton.svelte' import Label from '../Label.svelte' diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte index 866396bd..34340614 100644 --- a/src/routes/inbox/+page.svelte +++ b/src/routes/inbox/+page.svelte @@ -47,7 +47,7 @@
      {$t('routes.inbox.title')} -
      +
      {/snippet} - {#if content}{@render content()}{:else} -
      + {#if content} + {@render content()} + {:else} +
      {@render children?.()}
      {/if} diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index b91d0b0e..d03d9e79 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -316,7 +316,7 @@ .btn-disabled { pointer-events: none; - filter: brightness(70%); + filter: brightness(90%); cursor: normal; } } diff --git a/src/lib/mono/disclosure/Disclosure.svelte b/src/lib/mono/disclosure/Disclosure.svelte index d249f73c..272e0e09 100644 --- a/src/lib/mono/disclosure/Disclosure.svelte +++ b/src/lib/mono/disclosure/Disclosure.svelte @@ -1,8 +1,6 @@
      - + {@render extended?.()} - {#if open} -
      - {@render children?.({ open })} -
      - {/if} + +
      + {@render children?.({ open })} +
      + + diff --git a/src/lib/mono/materials/Material.svelte b/src/lib/mono/materials/Material.svelte index 518867a7..b7945896 100644 --- a/src/lib/mono/materials/Material.svelte +++ b/src/lib/mono/materials/Material.svelte @@ -24,7 +24,7 @@ } const roundedClass = { - none: 'rounded-none', + none: '', sm: 'rounded-xs', md: 'rounded-md', lg: 'rounded-lg', diff --git a/src/routes/inbox/InboxItem.svelte b/src/routes/inbox/InboxItem.svelte index 7bc56d3f..cfc9d6de 100644 --- a/src/routes/inbox/InboxItem.svelte +++ b/src/routes/inbox/InboxItem.svelte @@ -1,6 +1,7 @@
      {#if loaded} {#if type == 'video' || type == 'embed' || type == 'iframe'} @@ -37,11 +36,11 @@ url={href} opened={true} autoplay={false} - class="w-auto h-auto max-h-80 inline-block rounded-lg cursor-pointer" + class="w-auto h-auto max-h-80 inline-block rounded-[inherit] cursor-pointer" /> {:else} {/if} From 0f5ca7d943ed15eb92560824c5deac0d272bd36a Mon Sep 17 00:00:00 2001 From: Xylight Date: Tue, 23 Sep 2025 18:09:34 -0700 Subject: [PATCH 10/29] impr: make mobile navbar tap targets more conventional --- src/lib/components/ui/layout/Shell.svelte | 8 +-- src/lib/components/ui/navbar/NavButton.svelte | 64 ++++++++++++----- src/lib/components/ui/navbar/Navbar.svelte | 69 ++++++++++++------- 3 files changed, 94 insertions(+), 47 deletions(-) diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 6181c3de..1129be4c 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -38,9 +38,8 @@
      {#snippet prefix()} - {#if icon} - -
      - -
      - {:else} - {@render customIcon?.({ size: 16, isSelected })} - {/if} +
      + {#if customIcon} + {@render customIcon?.({ size: 16, isSelected })} + {:else if icon} + +
      + +
      + {/if} +
      {/snippet} - + {@render children?.()} @@ -67,10 +69,19 @@ @reference '../../../../app.css'; :global { + .prefix { + @variant max-md { + height: 100%; + display: grid; + place-items: center; + aspect-ratio: 1 / 1; + border-radius: 100%; + } + } + .nav-btn { width: calc(var(--spacing) * 10); height: calc(var(--spacing) * 10); - border-radius: 9999px; color: var(--color-slate-500); @@ -89,7 +100,7 @@ } .nav-btn-dynamic { - @variant lg { + @variant md { width: max-content; } } @@ -100,10 +111,31 @@ color: var(--color-primary-100); } - @variant max-lg { - background-color: var(--color-slate-200); + @variant max-md { + .prefix { + background-color: var(--color-slate-200); + @variant dark { + background-color: var(--color-zinc-800); + } + } + } + } + + @variant max-md { + .nav-btn-sm-primary .prefix { + background-color: var(--color-primary-900); + color: var(--color-slate-50); + + @variant hover { + color: initial; + } + @variant dark { - background-color: var(--color-zinc-800); + background-color: var(--color-primary-100); + color: var(--color-zinc-900); + @variant hover { + color: initial; + } } } } diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index 2fec0ae8..507412ef 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -9,6 +9,7 @@ import { Bars3, GlobeAlt, + Home, Icon, MagnifyingGlass, PencilSquare, @@ -33,8 +34,8 @@