From 8e2dd8b2784aafc34b935540d7a4fb8091bfea78 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 7 Apr 2026 14:53:19 -0700 Subject: [PATCH] Upgrade daisyui/tailwind --- package.json | 7 +- pnpm-lock.yaml | Bin 365315 -> 367454 bytes postcss.config.js | 3 +- src/app.css | 494 +++++++++--------- .../components/CalendarEventActions.svelte | 2 +- src/app/components/CalendarEventForm.svelte | 2 +- src/app/components/CalendarEventHeader.svelte | 2 +- src/app/components/CalendarEventMeta.svelte | 2 +- src/app/components/ChatCompose.svelte | 2 +- src/app/components/ClassifiedActions.svelte | 2 +- src/app/components/ClassifiedForm.svelte | 2 +- src/app/components/CommentActions.svelte | 2 +- src/app/components/Content.svelte | 2 +- src/app/components/ContentMinimal.svelte | 2 +- src/app/components/ContentQuote.svelte | 2 +- src/app/components/EventInfo.svelte | 4 +- src/app/components/EventReply.svelte | 2 +- src/app/components/GoalActions.svelte | 2 +- src/app/components/GoalCreate.svelte | 4 +- src/app/components/InfoZapperError.svelte | 2 +- src/app/components/InputProfilePicture.svelte | 4 +- .../components/NoteContentEventTime.svelte | 4 +- .../NoteContentMinimalEventTime.svelte | 2 +- src/app/components/PollOption.svelte | 2 +- src/app/components/PrimaryNav.svelte | 4 +- src/app/components/ProfileSpaces.svelte | 4 +- src/app/components/RelayAdd.svelte | 2 +- src/app/components/RelaySettingsItem.svelte | 4 +- src/app/components/RelaySummary.svelte | 2 +- src/app/components/RoomCompose.svelte | 2 +- src/app/components/RoomForm.svelte | 2 +- src/app/components/RoomItem.svelte | 2 +- src/app/components/RoomNameWithImage.svelte | 2 +- src/app/components/SpaceBar.svelte | 2 +- src/app/components/SpaceDetail.svelte | 2 +- src/app/components/SpaceEdit.svelte | 2 +- src/app/components/SpaceInvite.svelte | 2 +- src/app/components/SpaceMenu.svelte | 12 +- src/app/components/ThreadActions.svelte | 2 +- src/app/components/ThreadCreate.svelte | 2 +- src/app/components/VoiceRoomItem.svelte | 2 +- src/app/components/WalletPay.svelte | 2 +- src/app/components/WalletReceive.svelte | 2 +- src/app/components/WotScore.svelte | 4 +- src/app/components/Zap.svelte | 10 +- src/app/components/ZapInvoice.svelte | 12 +- src/lib/components/CardButton.svelte | 4 +- src/lib/components/Dialog.svelte | 2 +- src/lib/components/Divider.svelte | 4 +- src/lib/components/ModalFooter.svelte | 4 +- src/lib/components/Page.svelte | 2 +- src/lib/components/SecondaryNav.svelte | 2 +- src/lib/components/SecondaryNavItem.svelte | 2 +- src/lib/components/Tooltip.svelte | 12 +- src/routes/+layout.svelte | 1 + src/routes/chat/+page.svelte | 4 +- src/routes/settings/+layout.svelte | 7 +- src/routes/settings/profile/+page.svelte | 6 +- src/routes/spaces/[relay]/+page.svelte | 4 +- src/routes/spaces/[relay]/[h]/+page.svelte | 6 +- .../spaces/[relay]/calendar/+page.svelte | 4 +- .../[relay]/calendar/[address]/+page.svelte | 4 +- src/routes/spaces/[relay]/chat/+page.svelte | 4 +- tailwind.config.js | 51 +- 64 files changed, 380 insertions(+), 375 deletions(-) diff --git a/package.json b/package.json index b0dc3763..caa76285 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@eslint/js": "^9.39.2", "@sveltejs/kit": "^2.50.1", "@sveltejs/vite-plugin-svelte": "^4.0.4", + "@tailwindcss/postcss": "^4.2.2", "@tauri-apps/cli": "^2.9.6", "@types/eslint": "^9.6.1", "autoprefixer": "^10.4.23", @@ -35,7 +36,7 @@ "prettier-plugin-svelte": "^3.4.1", "svelte": "^5.48.0", "svelte-check": "^4.3.5", - "tailwindcss": "^3.4.19", + "tailwindcss": "^4.2.2", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1", "vite": "^5.4.21" @@ -77,7 +78,7 @@ "@welshman/store": "^0.8.12", "@welshman/util": "^0.8.12", "compressorjs-next": "^1.1.2", - "daisyui": "^4.12.24", + "daisyui": "^5.5.19", "date-picker-svelte": "^2.17.0", "dotenv": "^16.6.1", "emoji-picker-element": "^1.28.1", @@ -87,7 +88,7 @@ "livekit-client": "^2.17.2", "nostr-signer-capacitor-plugin": "github:coracle-social/nostr-signer-capacitor-plugin#main", "nostr-tools": "^2.19.4", - "prettier-plugin-tailwindcss": "^0.6.14", + "prettier-plugin-tailwindcss": "^0.7.2", "qr-scanner": "^1.4.2", "qrcode": "^1.5.4", "throttle-debounce": "^5.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9f6bebf74fa25a5155ae192578c2d223a659550b..7d052dd4b4f99050c361246a9134514228119821 100644 GIT binary patch delta 9345 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 diff --git a/postcss.config.js b/postcss.config.js index 2e7af2b7..fb05b569 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,6 +1,5 @@ export default { plugins: { - tailwindcss: {}, - autoprefixer: {}, + "@tailwindcss/postcss": {}, }, } diff --git a/src/app.css b/src/app.css index 49e93922..9916ff0a 100644 --- a/src/app.css +++ b/src/app.css @@ -1,149 +1,245 @@ -@import "@welshman/editor/index.css"; +@import 'tailwindcss'; -@tailwind base; -@tailwind components; -@tailwind utilities; +@config "../tailwind.config.js"; -/* Fonts */ - -@font-face { - font-family: "Satoshis"; - font-style: normal; - font-weight: 400; - src: - local(""), - url("/fonts/Satoshi Symbol.ttf") format("truetype"); +@utility pt-sai { + padding-top: var(--sait); } -@font-face { - font-family: "Lato"; - font-style: normal; - font-weight: 400; - src: - local(""), - url("/fonts/Lato-Regular.ttf") format("truetype"); +@utility pr-sai { + padding-right: var(--sair); } -@font-face { - font-family: "Lato"; - font-style: bold; - font-weight: 600; - src: - local(""), - url("/fonts/Lato-Bold.ttf") format("truetype"); +@utility pb-sai { + padding-bottom: var(--saib); } -@font-face { - font-family: "Lato"; - font-style: italic; - font-weight: 400; - src: - local(""), - url("/fonts/Italic.ttf") format("truetype"); +@utility pl-sai { + padding-left: var(--sail); } -/* root */ - -:root { - font-family: Lato; - --sait: var(--safe-area-inset-top, env(safe-area-inset-top)); - --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom)); - --sail: var(--safe-area-inset-left, env(safe-area-inset-left)); - --sair: var(--safe-area-inset-right, env(safe-area-inset-right)); +@utility px-sai { + @apply pl-sai pr-sai; } -[data-theme] { - @apply bg-base-300; - --base-100: oklch(var(--b1)); - --base-200: oklch(var(--b2)); - --base-300: oklch(var(--b3)); - --base-content: oklch(var(--bc)); - --primary: oklch(var(--p)); - --primary-content: oklch(var(--pc)); - --secondary: oklch(var(--s)); - --secondary-content: oklch(var(--sc)); - --neutral: oklch(var(--n)); - --neutral-content: oklch(var(--nc)); +@utility py-sai { + @apply pt-sai pb-sai; } -.mobile [data-tip]::before { - display: none !important; +@utility p-sai { + @apply py-sai px-sai; } -/* safe area insets */ +@utility mt-sai { + margin-top: var(--sait); +} -@layer components { - .pt-sai { - padding-top: var(--sait); +@utility mr-sai { + margin-right: var(--sair); +} + +@utility mb-sai { + margin-bottom: var(--saib); +} + +@utility ml-sai { + margin-left: var(--sail); +} + +@utility mx-sai { + @apply ml-sai mr-sai; +} + +@utility my-sai { + @apply mt-sai mb-sai; +} + +@utility m-sai { + @apply my-sai mx-sai; +} + +@utility top-sai { + top: var(--sait); +} + +@utility right-sai { + right: var(--sair); +} + +@utility bottom-sai { + bottom: var(--saib); +} + +@utility left-sai { + left: var(--sail); +} + +@utility card2 { + @apply rounded-box text-base-content p-4 sm:p-6; +} + +@utility column { + @apply flex flex-col; +} + +@utility center { + @apply flex items-center justify-center; +} + +@utility row-2 { + @apply flex items-center gap-2; +} + +@utility row-3 { + @apply flex items-center gap-3; +} + +@utility row-4 { + @apply flex items-center gap-4; +} + +@utility col-2 { + @apply flex flex-col gap-2; +} + +@utility col-3 { + @apply flex flex-col gap-3; +} + +@utility col-4 { + @apply flex flex-col gap-4; +} + +@utility col-8 { + @apply flex flex-col gap-8; +} + +@utility ellipsize { + @apply overflow-hidden text-ellipsis; +} + +@utility content-padding-x { + @apply px-4 sm:px-8 md:px-12; +} + +@utility content-padding-t { + @apply pt-4 sm:pt-8 md:pt-12; +} + +@utility content-padding-b { + @apply pb-4 sm:pb-8 md:pb-12; +} + +@utility content-padding-y { + @apply pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12; +} + +@utility content-sizing { + @apply m-auto w-full max-w-3xl; +} + +@utility content { + @apply m-auto w-full max-w-3xl px-4 sm:px-8 md:px-12 pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12; +} + +@utility heading { + @apply text-center text-2xl; +} + +@utility subheading { + @apply text-center text-xl; +} + +@utility superheading { + @apply text-center text-4xl; +} + +@utility link { + @apply text-primary cursor-pointer underline; +} + +/* content visibility */ + +@utility cv { + content-visibility: auto; +} + +/* + The default border color has changed to `currentcolor` in Tailwind CSS v4, + so we've added these compatibility styles to make sure everything still + looks the same as it did with Tailwind CSS v3. + + If we ever want to remove these styles, we need to add an explicit border + color utility to any element that depends on these defaults. +*/ +@layer base { + *, + ::after, + ::before, + ::backdrop, + ::file-selector-button { + border-color: var(--color-gray-200, currentcolor); + } +} + +@layer utilities { + /* Fonts */ + + @font-face { + font-family: "Satoshis"; + font-style: normal; + font-weight: 400; + src: + local(""), + url("/fonts/Satoshi Symbol.ttf") format("truetype"); } - .pr-sai { - padding-right: var(--sair); + @font-face { + font-family: "Lato"; + font-style: normal; + font-weight: 400; + src: + local(""), + url("/fonts/Lato-Regular.ttf") format("truetype"); } - .pb-sai { - padding-bottom: var(--saib); + @font-face { + font-family: "Lato"; + font-style: bold; + font-weight: 600; + src: + local(""), + url("/fonts/Lato-Bold.ttf") format("truetype"); } - .pl-sai { - padding-left: var(--sail); + @font-face { + font-family: "Lato"; + font-style: italic; + font-weight: 400; + src: + local(""), + url("/fonts/Italic.ttf") format("truetype"); } - .px-sai { - @apply pl-sai pr-sai; + /* root */ + + :root { + font-family: Lato; + --sait: var(--safe-area-inset-top, env(safe-area-inset-top)); + --saib: var(--safe-area-inset-bottom, env(safe-area-inset-bottom)); + --sail: var(--safe-area-inset-left, env(safe-area-inset-left)); + --sair: var(--safe-area-inset-right, env(safe-area-inset-right)); } - .py-sai { - @apply pt-sai pb-sai; + [data-theme] { + @apply bg-base-300; } - .p-sai { - @apply py-sai px-sai; + .mobile [data-tip]::before { + display: none !important; } - .mt-sai { - margin-top: var(--sait); - } - - .mr-sai { - margin-right: var(--sair); - } - - .mb-sai { - margin-bottom: var(--saib); - } - - .ml-sai { - margin-left: var(--sail); - } - - .mx-sai { - @apply ml-sai mr-sai; - } - - .my-sai { - @apply mt-sai mb-sai; - } - - .m-sai { - @apply my-sai mx-sai; - } - - .top-sai { - top: var(--sait); - } - - .right-sai { - right: var(--sair); - } - - .bottom-sai { - bottom: var(--saib); - } - - .left-sai { - left: var(--sail); - } + /* safe area insets */ } /* utilities */ @@ -165,110 +261,18 @@ @apply bg-base-300 text-base-content transition-colors; } -.card2 { - @apply rounded-box p-4 text-base-content sm:p-6; -} - .card2.card2-sm { - @apply p-2 text-base-content sm:p-4; -} - -.column { - @apply flex flex-col; -} - -.center { - @apply flex items-center justify-center; -} - -.row-2 { - @apply flex items-center gap-2; -} - -.row-3 { - @apply flex items-center gap-3; -} - -.row-4 { - @apply flex items-center gap-4; -} - -.col-2 { - @apply flex flex-col gap-2; -} - -.col-3 { - @apply flex flex-col gap-3; -} - -.col-4 { - @apply flex flex-col gap-4; -} - -.col-8 { - @apply flex flex-col gap-8; -} - -.badge { - @apply justify-start overflow-hidden text-ellipsis whitespace-nowrap; -} - -.ellipsize { - @apply overflow-hidden text-ellipsis; + @apply text-base-content p-2 sm:p-4; } [data-tip]::before { - @apply ellipsize; -} - -.content-padding-x { - @apply px-4 sm:px-8 md:px-12; -} - -.content-padding-t { - @apply pt-4 sm:pt-8 md:pt-12; -} - -.content-padding-b { - @apply pb-4 sm:pb-8 md:pb-12; -} - -.content-padding-y { - @apply content-padding-t content-padding-b; -} - -.content-sizing { - @apply m-auto w-full max-w-3xl; -} - -.content { - @apply content-sizing content-padding-x content-padding-y; -} - -.heading { - @apply text-center text-2xl; -} - -.subheading { - @apply text-center text-xl; -} - -.superheading { - @apply text-center text-4xl; -} - -.link { - @apply cursor-pointer text-primary underline; + @apply overflow-hidden text-ellipsis; } .input input::placeholder { opacity: 0.5; } -.shadow-top-xl { - @apply shadow-[0_20px_25px_-5px_rgb(0,0,0,0.1)_0_8px_10px_-6px_rgb(0,0,0,0.1)]; -} - /* tiptap */ .input-editor, @@ -278,21 +282,21 @@ } .tiptap { - --tiptap-object-bg: var(--neutral); - --tiptap-object-fg: var(--neutral-content); - --tiptap-active-bg: var(--primary); - --tiptap-active-fg: var(--primary-content); + --tiptap-object-bg: var(--color-neutral); + --tiptap-object-fg: var(--color-neutral-content); + --tiptap-active-bg: var(--color-primary); + --tiptap-active-fg: var(--color-primary-content); } .tiptap-suggestions { - --tiptap-object-bg: var(--base-100); - --tiptap-object-fg: var(--base-content); - --tiptap-active-bg: var(--base-300); - --tiptap-active-fg: var(--base-content); + --tiptap-object-bg: var(--color-base-100); + --tiptap-object-fg: var(--color-base-content); + --tiptap-active-bg: var(--color-base-300); + --tiptap-active-fg: var(--color-base-content); } .tiptap-suggestions__item { - @apply border-l-2 border-solid border-base-100; + @apply border-base-100 border-l-2 border-solid; } .tiptap-suggestions__selected { @@ -312,13 +316,13 @@ } .note-editor .tiptap { - --tiptap-object-bg: var(--base-200); - @apply input input-bordered h-auto min-h-32 rounded-box p-[.65rem] pb-6; + --tiptap-object-bg: var(--color-base-200); + @apply input rounded-box h-auto min-h-32 p-[.65rem] pb-6; } .input-editor .tiptap { - --tiptap-object-bg: var(--base-200); - @apply input input-bordered h-auto p-[.65rem]; + --tiptap-object-bg: var(--color-base-200); + @apply input h-auto p-[.65rem]; } /* link-content, based on tiptap */ @@ -330,8 +334,8 @@ white-space: nowrap; border-radius: 3px; padding: 0 0.25rem; - background-color: var(--base-100); - color: var(--base-content); + background-color: var(--color-base-100); + color: var(--color-base-content); } /* content rendered by welshman/content */ @@ -347,25 +351,25 @@ /* date input */ .picker { - --date-picker-foreground: var(--base-content); - --date-picker-background: var(--base-300); - --date-picker-highlight-border: var(--primary); - --date-picker-selected-color: var(--primary-content); - --date-picker-selected-background: var(--primary); + --date-picker-foreground: var(--color-base-content); + --date-picker-background: var(--color-base-300); + --date-picker-highlight-border: var(--color-primary); + --date-picker-selected-color: var(--color-primary-content); + --date-picker-selected-background: var(--color-primary); } .date-time-field { - @apply input input-bordered rounded-lg px-0; + @apply input rounded-lg px-0; } .date-time-field input { - @apply !h-full !w-full !rounded-lg !border-none !bg-inherit !px-4 !text-inherit; + @apply h-full! w-full! rounded-lg! border-none! bg-inherit! px-4! text-inherit!; } /* tippy popover */ .tippy-target { - @apply pointer-events-none fixed inset-0 z-tooltip; + @apply z-tooltip pointer-events-none fixed inset-0; } .tippy-target > * { @@ -379,15 +383,15 @@ /* emoji picker */ emoji-picker { - --background: var(--base-100); - --border-color: var(--base-100); + --background: var(--color-base-100); + --border-color: var(--color-base-100); --border-radius: var(--rounded-box); - --button-active-background: var(--base-content); - --button-hover-background: var(--base-content); - --indicator-color: var(--base-content); - --input-border-color: var(--base-100); - --input-font-color: var(--base-content); - --outline-color: var(--base-100); + --button-active-background: var(--color-base-content); + --button-hover-background: var(--color-base-content); + --indicator-color: var(--color-base-content); + --input-border-color: var(--color-base-100); + --input-font-color: var(--color-base-content); + --outline-color: var(--color-base-100); } /* progress */ @@ -411,7 +415,7 @@ body.keyboard-open .hide-on-keyboard { /* chat view */ .chat__compose { - @apply relative z-compose mb-14 flex-grow md:mb-0; + @apply z-compose relative mb-14 grow md:mb-0; } .chat__compose .chat__compose-inner { @@ -419,11 +423,5 @@ body.keyboard-open .hide-on-keyboard { } .chat__scroll-down { - @apply pb-sai fixed bottom-28 right-4 z-feature md:bottom-16; -} - -/* content visibility */ - -.cv { - content-visibility: auto; + @apply pb-sai z-feature fixed right-4 bottom-28 md:bottom-16; } diff --git a/src/app/components/CalendarEventActions.svelte b/src/app/components/CalendarEventActions.svelte index a328a063..864fe35f 100644 --- a/src/app/components/CalendarEventActions.svelte +++ b/src/app/components/CalendarEventActions.svelte @@ -38,7 +38,7 @@ publishReaction({...template, event, relays: [url], protect: await shouldProtect}) -
+
{#if h && showRoom} Posted in # diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte index cacbecf2..c67c6fd7 100644 --- a/src/app/components/CalendarEventForm.svelte +++ b/src/app/components/CalendarEventForm.svelte @@ -155,7 +155,7 @@ {#snippet input()}
-
+
@@ -109,6 +109,6 @@
- + diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte index c026dd47..fd29ee54 100644 --- a/src/app/components/EventReply.svelte +++ b/src/app/components/EventReply.svelte @@ -87,7 +87,7 @@ class="left-content bottom-sai right-sai ml-2 pl-2 fixed z-feature">
-
+
+ diff --git a/src/app/components/RelaySettingsItem.svelte b/src/app/components/RelaySettingsItem.svelte index 039c2105..70641930 100644 --- a/src/app/components/RelaySettingsItem.svelte +++ b/src/app/components/RelaySettingsItem.svelte @@ -26,8 +26,8 @@ type="button" class="btn font-normal flex h-[unset] w-full flex-nowrap py-4 text-left items-start justify-between" {onclick}> -
-
+
+
diff --git a/src/app/components/RelaySummary.svelte b/src/app/components/RelaySummary.svelte index 4671074b..45f28ef0 100644 --- a/src/app/components/RelaySummary.svelte +++ b/src/app/components/RelaySummary.svelte @@ -23,7 +23,7 @@
+ class="center flex! h-12 w-12 min-w-12 rounded-full border-2 border-solid border-base-300 bg-base-300">
diff --git a/src/app/components/RoomCompose.svelte b/src/app/components/RoomCompose.svelte index 863ddf6f..f3aeef4f 100644 --- a/src/app/components/RoomCompose.svelte +++ b/src/app/components/RoomCompose.svelte @@ -132,7 +132,7 @@
-
+
-
+
{@render title?.()} diff --git a/src/app/components/SpaceDetail.svelte b/src/app/components/SpaceDetail.svelte index 3855eada..7d23f447 100644 --- a/src/app/components/SpaceDetail.svelte +++ b/src/app/components/SpaceDetail.svelte @@ -42,7 +42,7 @@
+ class="center flex! h-16 w-16 min-w-16 rounded-full border-2 border-solid border-base-300 bg-base-300">
diff --git a/src/app/components/SpaceEdit.svelte b/src/app/components/SpaceEdit.svelte index 528bf9be..8739d470 100644 --- a/src/app/components/SpaceEdit.svelte +++ b/src/app/components/SpaceEdit.svelte @@ -134,7 +134,7 @@

Icon

{/snippet} {#snippet input()} -
+
{#if imagePreview}
Selected: diff --git a/src/app/components/SpaceInvite.svelte b/src/app/components/SpaceInvite.svelte index b6cc7105..79a15a84 100644 --- a/src/app/components/SpaceInvite.svelte +++ b/src/app/components/SpaceInvite.svelte @@ -100,6 +100,6 @@
- + diff --git a/src/app/components/SpaceMenu.svelte b/src/app/components/SpaceMenu.svelte index 78a03fef..782e3509 100644 --- a/src/app/components/SpaceMenu.svelte +++ b/src/app/components/SpaceMenu.svelte @@ -140,7 +140,7 @@
-
+
+ class="flex shrink-0 flex-col gap-2 p-2 pt-0 -mt-4 pb-[calc(var(--saib)+0.25rem)] md:pb-2 z-nav">
{#if isVoiceRoom || $voiceState === VoiceState.Joining || $voiceState === VoiceState.Connected} -
+
{/if} diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte index e2ff365b..ef999809 100644 --- a/src/routes/spaces/[relay]/calendar/+page.svelte +++ b/src/routes/spaces/[relay]/calendar/+page.svelte @@ -128,9 +128,9 @@
{#if isFirstFutureEvent}
-
+

Today

-
+
{/if} {#if dateDisplay} diff --git a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte index ed2aacb1..bde8ecb7 100644 --- a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte +++ b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte @@ -69,11 +69,11 @@
-
+
-
+
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte index d1915b9e..8290a535 100644 --- a/src/routes/spaces/[relay]/chat/+page.svelte +++ b/src/routes/spaces/[relay]/chat/+page.svelte @@ -311,9 +311,9 @@ {id} class="flex items-center py-2 text-xs transition-colors" class:opacity-0={showFixedNewMessages}> -
+

New Messages

-
+
{:else if type === "date"} {value} diff --git a/tailwind.config.js b/tailwind.config.js index 0083477d..d312ad05 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,6 +1,7 @@ import {config} from "dotenv" import daisyui from "daisyui" -import themes from "daisyui/src/theming/themes" +import daisyTheme from "daisyui/theme" +import themes from "daisyui/theme/object" config({path: ".env.local"}) config({path: ".env"}) @@ -25,27 +26,29 @@ export default { toast: 9, }, }, - plugins: [daisyui], - daisyui: { - themes: [ - { - dark: { - ...themes["dark"], - primary: process.env.VITE_PLATFORM_ACCENT, - "primary-content": process.env.VITE_PLATFORM_ACCENT_CONTENT || "#EAE7FF", - secondary: process.env.VITE_PLATFORM_SECONDARY, - "secondary-content": process.env.VITE_PLATFORM_SECONDARY_CONTENT || "#EAE7FF", - }, - light: { - ...themes["winter"], - neutral: "#F2F7FF", - warning: "#FD8D0B", - primary: process.env.VITE_PLATFORM_ACCENT, - "primary-content": process.env.VITE_PLATFORM_ACCENT_CONTENT || "#EAE7FF", - secondary: process.env.VITE_PLATFORM_SECONDARY, - "secondary-content": process.env.VITE_PLATFORM_SECONDARY_CONTENT || "#EAE7FF", - }, - }, - ], - }, + plugins: [ + daisyui({ + themes: ["light --default", "dark --prefersdark"], + }), + daisyTheme({ + name: "dark", + ...themes["night"], + "--color-base-content": "oklch(75% 0.029 256.847)", + "--color-primary": process.env.VITE_PLATFORM_ACCENT, + "--color-primary-content": process.env.VITE_PLATFORM_ACCENT_CONTENT || "#EAE7FF", + "--color-secondary": process.env.VITE_PLATFORM_SECONDARY, + "--color-secondary-content": process.env.VITE_PLATFORM_SECONDARY_CONTENT || "#EAE7FF", + }), + daisyTheme({ + name: "light", + ...themes["winter"], + "--color-neutral": "#F2F7FF", + "--color-neutral-content": "var(--color-base-content)", + "--color-warning": "#FD8D0B", + "--color-primary": process.env.VITE_PLATFORM_ACCENT, + "--color-primary-content": process.env.VITE_PLATFORM_ACCENT_CONTENT || "#EAE7FF", + "--color-secondary": process.env.VITE_PLATFORM_SECONDARY, + "--color-secondary-content": process.env.VITE_PLATFORM_SECONDARY_CONTENT || "#EAE7FF", + }), + ], }