diff --git a/components/base/Toaster.vue b/components/base/Toaster.vue index 2f040f0..9cc2273 100644 --- a/components/base/Toaster.vue +++ b/components/base/Toaster.vue @@ -4,10 +4,12 @@

{{ toast.title }}

× - {{ toast.content }} + {{ toast.content }}
- + @@ -37,14 +39,16 @@ function tryClose(config: ExtraToastConfig, state: boolean) .ToastRoot[data-type='error'] { @apply border-light-red; @apply dark:border-dark-red; - @apply bg-light-redBack; - @apply dark:bg-dark-redBack; + @apply bg-light-red; + @apply dark:bg-dark-red; + @apply !bg-opacity-50; } .ToastRoot[data-type='success'] { @apply border-light-green; @apply dark:border-dark-green; - @apply bg-light-greenBack; - @apply dark:bg-dark-greenBack; + @apply bg-light-green; + @apply dark:bg-dark-green; + @apply !bg-opacity-50; } .ToastRoot[data-state='open'] { animation: slideIn .15s cubic-bezier(0.16, 1, 0.3, 1); diff --git a/db.sqlite b/db.sqlite index cb89a88..6642668 100644 Binary files a/db.sqlite and b/db.sqlite differ diff --git a/db.sqlite-shm b/db.sqlite-shm index 79c6088..73c2e74 100644 Binary files a/db.sqlite-shm and b/db.sqlite-shm differ diff --git a/db.sqlite-wal b/db.sqlite-wal index e066d12..efc803c 100644 Binary files a/db.sqlite-wal and b/db.sqlite-wal differ diff --git a/error.vue b/error.vue index 7c5ab92..cab5788 100644 --- a/error.vue +++ b/error.vue @@ -14,12 +14,12 @@ \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index ce5c693..55e9f92 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -56,14 +56,14 @@ export default defineNuxtConfig({ current: 'currentColor', light: { red: '#e93147', - redBack: '#F9C7CD', - orange: '#ec7500', - yellow: '#e0ac00', - green: '#08b94e', - greenBack: '#BCECCF', + orange: '#FF9800', + yellow: '#FFEB3B', + green: '#388E3C', + indigo: '#7986CB', cyan: '#00bfbc', + lime: '#8BC34A', blue: '#086ddd', - purple: '#7852ee', + purple: '#AB47BC', pink: '#d53984', 0: "#ffffff", 5: "#fcfcfc", diff --git a/pages/character/[id]/edit.client.vue b/pages/character/[id]/edit.client.vue index 01b0675..27285d9 100644 --- a/pages/character/[id]/edit.client.vue +++ b/pages/character/[id]/edit.client.vue @@ -352,7 +352,7 @@ useShortcuts({ {{ spell.name }}
- {{ elementTexts[element].text }} + {{ elementTexts[element].text }}
Rang {{ spell.rank }}/ diff --git a/pages/character/[id]/index.client.vue b/pages/character/[id]/index.client.vue index 703fa89..372be63 100644 --- a/pages/character/[id]/index.client.vue +++ b/pages/character/[id]/index.client.vue @@ -12,6 +12,18 @@ const { user } = useUserSession(); const { add } = useToast(); const { data: character, status, error } = await useFetch(`/api/character/${id}/compiled`); + +/* +text-light-red dark:text-dark-red border-light-red dark:border-dark-red bg-light-red dark:bg-dark-red +text-light-blue dark:text-dark-blue border-light-blue dark:border-dark-blue bg-light-blue dark:bg-dark-blue +text-light-yellow dark:text-dark-yellow border-light-yellow dark:border-dark-yellow bg-light-yellow dark:bg-dark-yellow +text-light-orange dark:text-dark-orange border-light-orange dark:border-dark-orange bg-light-orange dark:bg-dark-orange +text-light-indigo dark:text-dark-indigo border-light-indigo dark:border-dark-indigo bg-light-indigo dark:bg-dark-indigo +text-light-lime dark:text-dark-lime border-light-lime dark:border-dark-lime bg-light-lime dark:bg-dark-lime +text-light-green dark:text-dark-green border-light-green dark:border-dark-green bg-light-green dark:bg-dark-green +text-light-yellow dark:text-dark-yellow border-light-yellow dark:border-dark-yellow bg-light-yellow dark:bg-dark-yellow +text-light-purple dark:text-dark-purple border-light-purple dark:border-dark-purple bg-light-purple dark:bg-dark-purple +*/