diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index b2c1e3d7..e8c3fd9b 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -101,7 +101,7 @@
@@ -142,24 +145,30 @@ {#snippet target()} {/snippet} {#snippet popover()} {#if community && subscribed} -
-
+ {/if} {/snippet}
@@ -175,7 +184,7 @@ /> {/if}
@@ -346,8 +354,6 @@ 'avatar community badges' 'avatar stats badges'; gap: 0; - grid-template-rows: auto auto; - grid-template-columns: max-content minmax(0, auto) auto; } @media screen and (max-width: 480px) { @@ -359,11 +365,6 @@ gap: 0; grid-template-rows: auto auto auto; grid-template-columns: 40px minmax(0, auto); - } - } - - @media screen and (max-width: 480px) { - .meta.compact { grid-template-columns: 32px minmax(0, auto); } } diff --git a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte index d3dd4f6b..4c7f031c 100644 --- a/src/lib/components/lemmy/post/feed/VirtualFeed.svelte +++ b/src/lib/components/lemmy/post/feed/VirtualFeed.svelte @@ -169,7 +169,7 @@ {:else} -{#if embed_title && view != 'compact'} +{#if embed_title && view == 'cozy'} - import { settings } from '$lib/settings.svelte' - interface Props { pageHeader?: boolean style?: string @@ -28,8 +26,7 @@ {style} >

{@render children?.()}

diff --git a/src/lib/components/ui/sidebar/SidebarButton.svelte b/src/lib/components/ui/sidebar/SidebarButton.svelte index 7318d24f..0cf7b725 100644 --- a/src/lib/components/ui/sidebar/SidebarButton.svelte +++ b/src/lib/components/ui/sidebar/SidebarButton.svelte @@ -41,6 +41,7 @@ class="font-normal block origin-left! border border-transparent dark:hover:bg-zinc-900 {!selected ? 'text-slate-600 dark:text-zinc-400' : 'bg-slate-100 dark:bg-zinc-925'} {clazz}" + shadow="none" > {#snippet prefix()} {#if customIcon} diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index bcb27775..3057eae7 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -149,7 +149,7 @@ rounding = size == 'lg' ? 'xl' : 'lg', roundingSide = 'all', alignment = 'center', - shadow = 'none', + shadow = 'sm', column = false, disabled, loaderWidth = undefined, @@ -185,11 +185,12 @@ type={submit ? 'submit' : 'button'} >
{#if loading} diff --git a/src/lib/mono/forms/select/Select.svelte b/src/lib/mono/forms/select/Select.svelte index e850af87..2a400698 100644 --- a/src/lib/mono/forms/select/Select.svelte +++ b/src/lib/mono/forms/select/Select.svelte @@ -101,11 +101,14 @@ {...rest} {id} bind:this={element} - class="{buttonSize[size]} {buttonShadow[ - shadow - ]} {buttonColor.secondary} appearance-none transition-colors rounded-lg text-sm - w-full min-w-full cursor-pointer pr-6 {buttonColor.secondary} - {clazz} {selectClass}" + class={[ + buttonSize[size], + buttonShadow[shadow], + buttonColor.secondary, + 'appearance-none transition-colors rounded-xl text-sm w-full min-w-full cursor-pointer pr-6', + selectClass, + clazz, + ]} bind:value onmousedown={e => { e.preventDefault() @@ -138,11 +141,20 @@ }} size="custom" disabled={option.disabled} - class="min-h-0! py-[5px]! {option.value == value - ? 'bg-slate-100! dark:bg-zinc-800!' - : ''}" + class={[ + 'min-h-0! py-[5px]!', + option.value == value && + 'bg-slate-100! dark:bg-zinc-800! text-primary-900 dark:text-primary-100 font-medium!', + ]} > - {#if option.icon} + {#if option.value == value} + + {:else if option.icon} {/if} {@html option.label} - {#if option.value == value} - - {/if} {/if} {/each} diff --git a/src/lib/mono/popover/MenuButton.svelte b/src/lib/mono/popover/MenuButton.svelte index e990b5f2..9a990f30 100644 --- a/src/lib/mono/popover/MenuButton.svelte +++ b/src/lib/mono/popover/MenuButton.svelte @@ -6,13 +6,14 @@ type ButtonProps, } from '../button/Button.svelte' import { Icon, type IconSource } from 'svelte-hero-icons' + import type { ClassValue } from 'svelte/elements' interface Props extends ButtonProps { color?: ButtonColor alignment?: ButtonAlignment href?: string | undefined disabled?: boolean - class?: string + class?: ClassValue icon?: IconSource prefix?: Snippet children?: Snippet @@ -37,21 +38,23 @@ {...rest} {color} rounding="none" - class="w-full px-2 rounded-lg min-h-8 font-normal {disabled - ? 'opacity-70 pointer-events-none cursor-not-allowed' - : ''} {color == 'tertiary' - ? 'dark:hover:bg-zinc-800/70' - : ''} duration-100 {clazz}" + class={[ + 'w-full px-2 rounded-lg min-h-8 font-normal duration-100', + disabled && 'opacity-70 pointer-events-none cursor-not-allowed', + color == 'tertiary' && 'dark:hover:bg-zinc-800/70', + clazz, + ]} {alignment} {href} {disabled} + shadow="none" > {#snippet prefix()}
{#if icon} diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts index 61562824..b83e3403 100644 --- a/src/lib/settings.svelte.ts +++ b/src/lib/settings.svelte.ts @@ -65,7 +65,7 @@ interface Settings { debugInfo: boolean expandImages: boolean - font: 'inter' | 'satoshi/nunito' | 'system' | 'browser' + font: 'inter' | 'system' | 'browser' leftAlign: boolean hidePhoton: boolean diff --git a/src/lib/ui/presets.ts b/src/lib/ui/presets.ts index 8a5fe04d..4c354fcc 100644 --- a/src/lib/ui/presets.ts +++ b/src/lib/ui/presets.ts @@ -20,17 +20,18 @@ export function getDefaultColors(): ThemeColors { 950: '2 6 23', }, zinc: { - 50: '251 253 255', - 100: '246 247 249', - 300: '217 221 226', - 400: '171 177 188', - 500: '127 133 146', - 600: '95 104 117', - 700: '75 84 99', - 800: '42 50 63', - 900: '32 37 50', - 925: '28 32 43', - 950: '23 27 36', + '50': '252 252 252', + '100': '248 248 249', + '200': '235 235 238', + '300': '222 222 226', + '400': '175 175 183', + '500': '128 128 136', + '600': '98 98 106', + '700': '68 68 74', + '800': '47 47 52', + '900': '34 34 37', + '925': '28 28 30', + '950': '25 25 27', }, primary: { 100: '241 245 249', diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index be447706..78053ea8 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -401,7 +401,6 @@ {/snippet} diff --git a/src/style/app.css b/src/style/app.css index 00837350..38909636 100644 --- a/src/style/app.css +++ b/src/style/app.css @@ -8,10 +8,9 @@ --font-*: initial; --font-sans: sans-serif; --font-system: system-ui; - --font-serif: serif; --font-inter: Inter, system-ui, sans-serif; --font-nunito: Nunito, system-ui, sans-serif; - --font-display: Satoshi, system-ui, sans-serif; + --font-display: Inter, system-ui, sans-serif; --font-mono: monospace; --animate-pop-in: pop-in 0.25s ease-out forwards; @@ -59,6 +58,19 @@ } } +.cc { + inset: -1px; + position: absolute; + border-radius: inherit; + z-index: -1; + background: linear-gradient( + 125deg, + color-mix(in oklab, var(--color-zinc-50) 20%, transparent), + color-mix(in oklab, var(--color-zinc-50) 0%, transparent), + color-mix(in oklab, var(--color-zinc-50) 20%, transparent) + ); +} + /* The default border color has changed to `currentcolor` in Tailwind CSS v4, so we've added these compatibility styles to make sure everything still @@ -95,6 +107,12 @@ font-display: swap; } +@font-face { + font-family: 'EBGaramond'; + src: url('/font/EBGaramond-Regular.woff2') format('woff2'); + font-display: swap; +} + body { @apply bg-slate-50 text-slate-900 dark:bg-zinc-950 dark:text-zinc-100 accent-slate-950 dark:accent-zinc-50; } diff --git a/static/font/EBGaramond-Regular.woff2 b/static/font/EBGaramond-Regular.woff2 new file mode 100644 index 00000000..f3d9ce1b Binary files /dev/null and b/static/font/EBGaramond-Regular.woff2 differ