From 7e6e31aa83acfaffee391882f11337d55c8b42e2 Mon Sep 17 00:00:00 2001 From: Drake Date: Mon, 29 Jun 2026 14:42:57 -0500 Subject: [PATCH] updates before nlc --- src/app.css | 19 +++++++++++++------ src/lib/components/ui/button/button.svelte | 1 + src/routes/+page.svelte | 2 +- src/routes/items/+page.svelte | 4 ++-- .../inquiries/[inquiryId]/+page.svelte | 15 ++++++++++++--- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/app.css b/src/app.css index 5423343..3d4f7fc 100644 --- a/src/app.css +++ b/src/app.css @@ -14,10 +14,12 @@ --popover-foreground: oklch(0.141 0.005 285.823); --primary: oklch(0.5852 0.25 292.717); --primary-foreground: oklch(0.969 0.016 293.756); + --dull-primary: oklch(0.8225 0.0927 293.01); + --dull-primary-foreground: oklch(0.0 0.016 293.756); --secondary: oklch(0.967 0.001 286.375); --secondary-foreground: oklch(0.21 0.006 285.885); --muted: oklch(0.967 0.001 286.375); - --muted-foreground: oklch(0.552 0.016 285.938); + --muted-foreground: oklch(0.402 0.016 285.938); --accent: oklch(0.967 0.001 286.375); --accent-foreground: oklch(0.21 0.006 285.885); --destructive: oklch(0.577 0.245 27.325); @@ -40,7 +42,7 @@ --warning: oklch(0.6 0.16 84); --error: oklch(0.577 0.245 27.325); --positive: oklch(0.5 0.2067 147.18); - --action: oklch(0.5852 0.2263 260.47); + --action: oklch(0.4852 0.2263 260.47); } .dark { @@ -50,12 +52,15 @@ --card-foreground: oklch(0.985 0 0); --popover: oklch(0.21 0.006 285.885); --popover-foreground: oklch(0.985 0 0); - --primary: oklch(0.541 0.281 293.009); - --primary-foreground: oklch(0.969 0.016 293.756); + --primary: oklch(0.72 0.331 293.009); + --primary-foreground: oklch(0.0 0.016 293.756); + --dull-primary: oklch(0.35 0.281 293.009); + --dull-primary-foreground: oklch(0.969 0.016 293.756); + /*--primary-foreground: oklch(0.969 0.016 293.756);*/ --secondary: oklch(0.274 0.006 286.033); --secondary-foreground: oklch(0.985 0 0); --muted: oklch(0.274 0.006 286.033); - --muted-foreground: oklch(0.705 0.015 286.067); + --muted-foreground: oklch(0.755 0.015 286.067); --accent: oklch(0.274 0.006 286.033); --accent-foreground: oklch(0.985 0 0); --destructive: oklch(0.704 0.191 22.216); @@ -78,7 +83,7 @@ --warning: oklch(0.84 0.16 84); --error: oklch(0.704 0.191 22.216); --positive: oklch(0.7522 0.2067 147.18); - --action: oklch(0.6098 0.1872 260.47); + --action: oklch(0.7098 0.1872 260.47); } @theme inline { @@ -94,6 +99,8 @@ --color-popover-foreground: var(--popover-foreground); --color-primary: var(--primary); --color-primary-foreground: var(--primary-foreground); + --color-dull-primary: var(--dull-primary); + --color-dull-primary-foreground: var(--dull-primary-foreground); --color-secondary: var(--secondary); --color-secondary-foreground: var(--secondary-foreground); --color-muted: var(--muted); diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte index f7d27e6..96ae883 100644 --- a/src/lib/components/ui/button/button.svelte +++ b/src/lib/components/ui/button/button.svelte @@ -8,6 +8,7 @@ variants: { variant: { default: 'bg-primary text-primary-foreground hover:bg-primary/90 shadow-xs', + dull_default: 'bg-dull-primary text-dull-primary-foreground hover:bg-dull-primary/90 shadow-xs', destructive: 'bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white shadow-xs', outline: diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 78b389a..b905297 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -24,7 +24,7 @@
Browse lost items diff --git a/src/routes/items/+page.svelte b/src/routes/items/+page.svelte index e77a828..fce9f73 100644 --- a/src/routes/items/+page.svelte +++ b/src/routes/items/+page.svelte @@ -59,12 +59,12 @@
- +
diff --git a/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.svelte b/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.svelte index 89c083c..fda06cc 100644 --- a/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.svelte +++ b/src/routes/items/[itemId]/inquiries/[inquiryId]/+page.svelte @@ -9,6 +9,7 @@ import * as item from 'valibot'; import NoImagePlaceholder from '$lib/components/custom/no-image-placeholder.svelte'; import { Separator } from '$lib/components/ui/separator'; + import { dateFormatOptions } from '$lib/shared'; let { data } = $props(); @@ -35,6 +36,14 @@ } }; + const dateTimeFormatOptions: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'short', + day: 'numeric', + hour: 'numeric', + minute: 'numeric', + }; +
@@ -78,7 +87,7 @@

{msg.body}

- {msg.createdAt.toLocaleString()} + {new Date(msg.createdAt as unknown as string).toLocaleDateString('en-US', dateTimeFormatOptions)}
{/each} @@ -88,11 +97,11 @@
-