From cc07f898ea8e32565220d35b3fbbe2f8f5b8b1f0 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Wed, 16 Apr 2025 12:00:38 +0200 Subject: [PATCH] Ran upgrade cli --- assets/main.css | 24 ++++++++-- components/calendar/Calendar.vue | 2 +- components/calendar/category/Table.vue | 2 +- components/calendar/category/TableFooter.vue | 2 +- components/calendar/category/TableRow.vue | 2 +- components/calendar/form/Create.vue | 2 +- components/calendar/form/CreateEvent.vue | 6 +-- components/calendar/form/Update.vue | 2 +- components/calendar/form/UpdateEvent.vue | 6 +-- components/calendar/search/CalendarSearch.vue | 2 +- components/ui/badge/index.ts | 2 +- components/ui/button/Button.vue | 2 +- components/ui/button/index.ts | 2 +- components/ui/card/Card.vue | 6 +-- components/ui/checkbox/Checkbox.vue | 2 +- components/ui/command/CommandInput.vue | 2 +- components/ui/command/CommandItem.vue | 2 +- components/ui/dialog/DialogContent.vue | 2 +- .../DropdownMenuCheckboxItem.vue | 2 +- .../ui/dropdown-menu/DropdownMenuItem.vue | 2 +- .../dropdown-menu/DropdownMenuRadioItem.vue | 2 +- .../dropdown-menu/DropdownMenuSubTrigger.vue | 2 +- .../ui/dropdown-menu/DropdownMenuTrigger.vue | 2 +- components/ui/input/Input.vue | 2 +- components/ui/popover/PopoverContent.vue | 2 +- components/ui/select/SelectContent.vue | 2 +- components/ui/select/SelectItem.vue | 2 +- components/ui/select/SelectTrigger.vue | 2 +- components/ui/switch/Switch.vue | 2 +- components/ui/table/TableFooter.vue | 2 +- components/ui/tabs/TabsContent.vue | 2 +- components/ui/tabs/TabsTrigger.vue | 2 +- components/ui/tags-input/TagsInputInput.vue | 2 +- components/ui/toast/ToastAction.vue | 2 +- components/ui/toast/ToastClose.vue | 2 +- components/ui/toast/ToastViewport.vue | 2 +- components/ui/toast/index.ts | 2 +- components/ui/toggle/index.ts | 2 +- components/world/form/Create.vue | 4 +- components/world/form/Update.vue | 4 +- package.json | 2 +- pnpm-lock.yaml | 47 ++++++++++--------- 42 files changed, 95 insertions(+), 72 deletions(-) diff --git a/assets/main.css b/assets/main.css index 98cf58b..05d7f2f 100644 --- a/assets/main.css +++ b/assets/main.css @@ -1,6 +1,24 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'tailwindcss'; + +@config '../tailwind.config.js'; + +/* + 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 base { :root { diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue index d39f995..6cb9a1c 100644 --- a/components/calendar/Calendar.vue +++ b/components/calendar/Calendar.vue @@ -35,7 +35,7 @@ onMounted(() => { diff --git a/components/calendar/category/TableRow.vue b/components/calendar/category/TableRow.vue index 7d6f3ad..cc6f764 100644 --- a/components/calendar/category/TableRow.vue +++ b/components/calendar/category/TableRow.vue @@ -127,7 +127,7 @@ function handleQueryDelete() { ref="inputRef" v-model="categorySkeleton.name" type="text" - class="p-1 h-full w-full bg-transparent focus-visible:outline-none italic" + class="p-1 h-full w-full bg-transparent focus-visible:outline-hidden italic" > diff --git a/components/calendar/form/Create.vue b/components/calendar/form/Create.vue index fa7c625..9263c6e 100644 --- a/components/calendar/form/Create.vue +++ b/components/calendar/form/Create.vue @@ -105,7 +105,7 @@ function handleFormCancel() { name="new-calendar-name" required :placeholder="$t('common.title')" - class="w-full py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" @input="handleNameChange" > diff --git a/components/calendar/form/CreateEvent.vue b/components/calendar/form/CreateEvent.vue index a7a82a9..a9636fc 100644 --- a/components/calendar/form/CreateEvent.vue +++ b/components/calendar/form/CreateEvent.vue @@ -67,7 +67,7 @@ function handleCancel() { :placeholder="$t('entity.calendar.event.title')" :maxlength="120" pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,120}" - class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500" + class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600 invalid:border-red-500" >
{{ t('entity.calendar.event.patterns.title') }} @@ -81,7 +81,7 @@ function handleCancel() { name="new-event-description" :placeholder="$t('entity.addDescription')" :maxlength="1200" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600 invalid:border-red-500" />
{{ t('entity.calendar.event.patterns.description') }} @@ -141,7 +141,7 @@ function handleCancel() { :placeholder="$t('entity.calendar.event.addLocation')" :maxlength="160" pattern="([A-Za-zÀ-ÖØ-öø-ÿ0-9\s\&\-\~]+){3,160}" - class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" >
{{ t('entity.calendar.event.patterns.location') }} diff --git a/components/calendar/form/Update.vue b/components/calendar/form/Update.vue index dc5d74e..72d2713 100644 --- a/components/calendar/form/Update.vue +++ b/components/calendar/form/Update.vue @@ -101,7 +101,7 @@ function handleFormCancel() { name="new-calendar-name" required :placeholder="$t('common.title')" - class="w-full py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" @input="handleNameChange" > diff --git a/components/calendar/form/UpdateEvent.vue b/components/calendar/form/UpdateEvent.vue index 009844b..5e3118e 100644 --- a/components/calendar/form/UpdateEvent.vue +++ b/components/calendar/form/UpdateEvent.vue @@ -79,7 +79,7 @@ function handleCancel() { :placeholder="$t('entity.calendar.event.title')" :minlength="3" :maxlength="120" - class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500" + class="w-full -my-1 py-1 -mx-1 px-1 text-lg border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600 invalid:border-red-500" >
{{ t('entity.calendar.event.patterns.title') }} @@ -95,7 +95,7 @@ function handleCancel() { name="new-event-description" :placeholder="$t('entity.addDescription')" :maxlength="1200" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600 invalid:border-red-500" />
{{ t('entity.calendar.event.patterns.description') }} @@ -159,7 +159,7 @@ function handleCancel() { :placeholder="$t('entity.calendar.event.addLocation')" :minlength="3" :maxlength="160" - class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600 invalid:border-red-500" + class="w-full -my-1 py-2 px-2 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600 invalid:border-red-500" >
diff --git a/components/calendar/search/CalendarSearch.vue b/components/calendar/search/CalendarSearch.vue index 531413b..13dea27 100644 --- a/components/calendar/search/CalendarSearch.vue +++ b/components/calendar/search/CalendarSearch.vue @@ -345,7 +345,7 @@ function handleCategoryUnselect(e: Category) { diff --git a/components/ui/badge/index.ts b/components/ui/badge/index.ts index 9db7cf6..33c8687 100644 --- a/components/ui/badge/index.ts +++ b/components/ui/badge/index.ts @@ -3,7 +3,7 @@ import { type VariantProps, cva } from "class-variance-authority" export { default as Badge } from "./Badge.vue" export const badgeVariants = cva( - "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2", + "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2", { variants: { variant: { diff --git a/components/ui/button/Button.vue b/components/ui/button/Button.vue index 1d50302..a918fae 100644 --- a/components/ui/button/Button.vue +++ b/components/ui/button/Button.vue @@ -26,7 +26,7 @@ const props = withDefaults(defineProps(), { CTRL + : diff --git a/components/ui/button/index.ts b/components/ui/button/index.ts index 88cb71f..187432c 100644 --- a/components/ui/button/index.ts +++ b/components/ui/button/index.ts @@ -3,7 +3,7 @@ import { type VariantProps, cva } from "class-variance-authority" export { default as Button } from "./Button.vue" export const buttonVariants = cva( - "inline-flex items-center justify-center gap-1 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-30", + "inline-flex items-center justify-center gap-1 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-30", { variants: { variant: { diff --git a/components/ui/card/Card.vue b/components/ui/card/Card.vue index 6a0bdf5..f753ad6 100644 --- a/components/ui/card/Card.vue +++ b/components/ui/card/Card.vue @@ -14,7 +14,7 @@ const emit = defineEmits(["on-click"]) diff --git a/components/ui/checkbox/Checkbox.vue b/components/ui/checkbox/Checkbox.vue index 6e848aa..4bfae62 100644 --- a/components/ui/checkbox/Checkbox.vue +++ b/components/ui/checkbox/Checkbox.vue @@ -21,7 +21,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) diff --git a/components/ui/command/CommandInput.vue b/components/ui/command/CommandInput.vue index f7414d8..be41fac 100644 --- a/components/ui/command/CommandInput.vue +++ b/components/ui/command/CommandInput.vue @@ -31,7 +31,7 @@ const forwardedProps = useForwardProps(delegatedProps) auto-focus :class=" cn( - 'flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50', + 'flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-hidden placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50', props.class ) " diff --git a/components/ui/command/CommandItem.vue b/components/ui/command/CommandItem.vue index 12fc534..f037477 100644 --- a/components/ui/command/CommandItem.vue +++ b/components/ui/command/CommandItem.vue @@ -21,7 +21,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) v-bind="forwarded" :class=" cn( - 'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[highlighted]:bg-accent data-[disabled]:pointer-events-none data-[disabled]:opacity-50', + 'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden data-highlighted:bg-accent data-disabled:pointer-events-none data-disabled:opacity-50', props.class ) " diff --git a/components/ui/dialog/DialogContent.vue b/components/ui/dialog/DialogContent.vue index 73f797c..ce8f797 100644 --- a/components/ui/dialog/DialogContent.vue +++ b/components/ui/dialog/DialogContent.vue @@ -41,7 +41,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) Close diff --git a/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue b/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue index c132cda..4d9341d 100644 --- a/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue +++ b/components/ui/dropdown-menu/DropdownMenuCheckboxItem.vue @@ -27,7 +27,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) v-bind="forwarded" :class=" cn( - 'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50', + 'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50', props.class ) " diff --git a/components/ui/dropdown-menu/DropdownMenuItem.vue b/components/ui/dropdown-menu/DropdownMenuItem.vue index 7631910..78efe84 100644 --- a/components/ui/dropdown-menu/DropdownMenuItem.vue +++ b/components/ui/dropdown-menu/DropdownMenuItem.vue @@ -21,7 +21,7 @@ const forwardedProps = useForwardProps(delegatedProps) v-bind="forwardedProps" :class=" cn( - 'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50', + 'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50', inset && 'pl-8', props.class ) diff --git a/components/ui/dropdown-menu/DropdownMenuRadioItem.vue b/components/ui/dropdown-menu/DropdownMenuRadioItem.vue index 82b8205..f1d51ff 100644 --- a/components/ui/dropdown-menu/DropdownMenuRadioItem.vue +++ b/components/ui/dropdown-menu/DropdownMenuRadioItem.vue @@ -28,7 +28,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) v-bind="forwarded" :class=" cn( - 'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50', + 'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-hidden transition-colors focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50', props.class ) " diff --git a/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue b/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue index 2c3ac29..d78aa08 100644 --- a/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue +++ b/components/ui/dropdown-menu/DropdownMenuSubTrigger.vue @@ -24,7 +24,7 @@ const forwardedProps = useForwardProps(delegatedProps) v-bind="forwardedProps" :class=" cn( - 'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-accent data-[state=open]:bg-accent', + 'flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-hidden focus:bg-accent data-[state=open]:bg-accent', props.class ) " diff --git a/components/ui/dropdown-menu/DropdownMenuTrigger.vue b/components/ui/dropdown-menu/DropdownMenuTrigger.vue index 96a1a0f..f70c7c5 100644 --- a/components/ui/dropdown-menu/DropdownMenuTrigger.vue +++ b/components/ui/dropdown-menu/DropdownMenuTrigger.vue @@ -7,7 +7,7 @@ const forwardedProps = useForwardProps(props) diff --git a/components/ui/input/Input.vue b/components/ui/input/Input.vue index 7d85113..1a5fff8 100644 --- a/components/ui/input/Input.vue +++ b/components/ui/input/Input.vue @@ -24,7 +24,7 @@ const modelValue = useVModel(props, "modelValue", emits, { v-model="modelValue" :class=" cn( - 'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', + 'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class ) " diff --git a/components/ui/popover/PopoverContent.vue b/components/ui/popover/PopoverContent.vue index 0bf3a79..7fc8081 100644 --- a/components/ui/popover/PopoverContent.vue +++ b/components/ui/popover/PopoverContent.vue @@ -37,7 +37,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) v-bind="{ ...forwarded, ...$attrs }" :class=" cn( - 'z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', + 'z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-hidden data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', props.class ) " diff --git a/components/ui/select/SelectContent.vue b/components/ui/select/SelectContent.vue index 3fb413c..1b5e963 100644 --- a/components/ui/select/SelectContent.vue +++ b/components/ui/select/SelectContent.vue @@ -52,7 +52,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) cn( 'p-1', position === 'popper' && - 'h-[--radix-select-trigger-height] w-full min-w-[--radix-select-trigger-width]' + 'h-(--radix-select-trigger-height) w-full min-w-(--radix-select-trigger-width)' ) " > diff --git a/components/ui/select/SelectItem.vue b/components/ui/select/SelectItem.vue index 7b84e43..9ed32af 100644 --- a/components/ui/select/SelectItem.vue +++ b/components/ui/select/SelectItem.vue @@ -26,7 +26,7 @@ const forwardedProps = useForwardProps(delegatedProps) v-bind="forwardedProps" :class=" cn( - 'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50', + 'relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-hidden focus:bg-accent focus:text-accent-foreground data-disabled:pointer-events-none data-disabled:opacity-50', props.class ) " diff --git a/components/ui/select/SelectTrigger.vue b/components/ui/select/SelectTrigger.vue index cd9940d..ba407f9 100644 --- a/components/ui/select/SelectTrigger.vue +++ b/components/ui/select/SelectTrigger.vue @@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps) v-bind="forwardedProps" :class=" cn( - 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background dark:bg-slate-950 contrast-more:dark:bg-slate-900 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', + 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background dark:bg-slate-950 contrast-more:dark:bg-slate-900 px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-hidden focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50', props.class ) " diff --git a/components/ui/switch/Switch.vue b/components/ui/switch/Switch.vue index 10fc951..2988fc1 100644 --- a/components/ui/switch/Switch.vue +++ b/components/ui/switch/Switch.vue @@ -26,7 +26,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits) diff --git a/components/ui/table/TableFooter.vue b/components/ui/table/TableFooter.vue index 7f3bf64..58d8a65 100644 --- a/components/ui/table/TableFooter.vue +++ b/components/ui/table/TableFooter.vue @@ -8,7 +8,7 @@ const props = defineProps<{ diff --git a/components/ui/tabs/TabsContent.vue b/components/ui/tabs/TabsContent.vue index 2d2226b..0c75403 100644 --- a/components/ui/tabs/TabsContent.vue +++ b/components/ui/tabs/TabsContent.vue @@ -16,7 +16,7 @@ const delegatedProps = computed(() => { diff --git a/components/ui/toast/ToastAction.vue b/components/ui/toast/ToastAction.vue index 23167ae..710056b 100644 --- a/components/ui/toast/ToastAction.vue +++ b/components/ui/toast/ToastAction.vue @@ -13,7 +13,7 @@ const delegatedProps = computed(() => { diff --git a/components/ui/toast/ToastClose.vue b/components/ui/toast/ToastClose.vue index 3799e75..e3b2fde 100644 --- a/components/ui/toast/ToastClose.vue +++ b/components/ui/toast/ToastClose.vue @@ -16,7 +16,7 @@ const delegatedProps = computed(() => { diff --git a/components/ui/toast/ToastViewport.vue b/components/ui/toast/ToastViewport.vue index 86ee992..8ae8a63 100644 --- a/components/ui/toast/ToastViewport.vue +++ b/components/ui/toast/ToastViewport.vue @@ -13,5 +13,5 @@ const delegatedProps = computed(() => { diff --git a/components/ui/toast/index.ts b/components/ui/toast/index.ts index 1579986..b08cbfd 100644 --- a/components/ui/toast/index.ts +++ b/components/ui/toast/index.ts @@ -14,7 +14,7 @@ export { default as ToastProvider } from "./ToastProvider.vue" export { toast, useToast } from "./use-toast" export const toastVariants = cva( - "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[--radix-toast-swipe-end-x] data-[swipe=move]:translate-x-[--radix-toast-swipe-move-x] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full", + "group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-(--radix-toast-swipe-end-x) data-[swipe=move]:translate-x-(--radix-toast-swipe-move-x) data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full sm:data-[state=open]:slide-in-from-bottom-full", { variants: { variant: { diff --git a/components/ui/toggle/index.ts b/components/ui/toggle/index.ts index 06590bb..7dc036e 100644 --- a/components/ui/toggle/index.ts +++ b/components/ui/toggle/index.ts @@ -3,7 +3,7 @@ import { type VariantProps, cva } from "class-variance-authority" export { default as Toggle } from "./Toggle.vue" export const toggleVariants = cva( - "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground", + "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground", { variants: { variant: { diff --git a/components/world/form/Create.vue b/components/world/form/Create.vue index 0693770..b9d41f6 100644 --- a/components/world/form/Create.vue +++ b/components/world/form/Create.vue @@ -65,7 +65,7 @@ function handleFormCancel() { name="new-world-name" required :placeholder="$t('common.title')" - class="w-full -my-1 mb-4 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full -my-1 mb-4 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" @input="handleNameChange" > @@ -74,7 +74,7 @@ function handleFormCancel() { v-model="worldSkeleton.description" name="new-world-description" :placeholder="$t('entity.addDescription')" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" />
diff --git a/components/world/form/Update.vue b/components/world/form/Update.vue index 16815a5..353c9f5 100644 --- a/components/world/form/Update.vue +++ b/components/world/form/Update.vue @@ -79,7 +79,7 @@ function handleFormCancel() { name="new-world-name" required :placeholder="$t('common.title')" - class="w-full -my-1 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full -my-1 py-2 -mx-1 px-1 text-xl border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" @input="handleNameChange" > @@ -88,7 +88,7 @@ function handleFormCancel() { v-model="worldSkeleton.description" name="new-world-description" :placeholder="$t('entity.addDescription')" - class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-none focus-visible:border-blue-600" + class="w-full -my-1 py-1 -mx-1 px-1 min-h-24 max-h-36 text-sm border-b-[1px] bg-transparent focus-visible:outline-hidden focus-visible:border-blue-600" />
diff --git a/package.json b/package.json index c8093c3..da902c6 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "postcss": "^8.5.3", "prettier": "^3.5.2", "sass": "^1.85.1", - "tailwindcss": "^3.4.17", + "tailwindcss": "^4.1.4", "typescript": "^5.7.3", "wrangler": "^3.111.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f0e2488..5cfc7a0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,7 +64,7 @@ importers: version: 3.0.2 tailwindcss-animate: specifier: ^1.0.7 - version: 1.0.7(tailwindcss@3.4.17) + version: 1.0.7(tailwindcss@4.1.4) vue: specifier: ^3.5.13 version: 3.5.13(typescript@5.7.3) @@ -118,8 +118,8 @@ importers: specifier: ^1.85.1 version: 1.85.1 tailwindcss: - specifier: ^3.4.17 - version: 3.4.17 + specifier: ^4.1.4 + version: 4.1.4 typescript: specifier: ^5.7.3 version: 5.7.3 @@ -1019,20 +1019,20 @@ packages: resolution: {integrity: sha512-6GT1BJ852gZ0gItNZN2krX5QAmea+cmdjMvsWohArAZ3GmHdnNANEcF9JjPXAMRtQ6Ux5E269ymamg/+WU6tQA==} engines: {node: '>= 16'} - '@intlify/message-compiler@11.0.0-rc.1': - resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==} + '@intlify/message-compiler@12.0.0-alpha.2': + resolution: {integrity: sha512-PD9C+oQbb7BF52hec0+vLnScaFkvnfX+R7zSbODYuRo/E2niAtGmHd0wPvEMsDhf9Z9b8f/qyDsVeZnD/ya9Ug==} engines: {node: '>= 16'} '@intlify/shared@10.0.5': resolution: {integrity: sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA==} engines: {node: '>= 16'} - '@intlify/shared@11.0.0-rc.1': - resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==} + '@intlify/shared@11.1.3': + resolution: {integrity: sha512-pTFBgqa/99JRA2H1qfyqv97MKWJrYngXBA/I0elZcYxvJgcCw3mApAoPW3mJ7vx3j+Ti0FyKUFZ4hWxdjKaxvA==} engines: {node: '>= 16'} - '@intlify/shared@11.1.1': - resolution: {integrity: sha512-2kGiWoXaeV8HZlhU/Nml12oTbhv7j2ufsJ5vQaa0VTjzUmZVdd/nmKFRAOJ/FtjO90Qba5AnZDwsrY7ZND5udA==} + '@intlify/shared@12.0.0-alpha.2': + resolution: {integrity: sha512-P2DULVX9nz3y8zKNqLw9Es1aAgQ1JGC+kgpx5q7yLmrnAKkPR5MybQWoEhxanefNJgUY5ehsgo+GKif59SrncA==} engines: {node: '>= 16'} '@intlify/unplugin-vue-i18n@6.0.3': @@ -4573,6 +4573,9 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + tailwindcss@4.1.4: + resolution: {integrity: sha512-1ZIUqtPITFbv/DxRmDr5/agPqJwF69d24m9qmM1939TJehgY539CtzeZRjbLt5G6fSy/7YqqYsfvoTEw9xUI2A==} + tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -5854,8 +5857,8 @@ snapshots: '@intlify/bundle-utils@10.0.0(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))': dependencies: - '@intlify/message-compiler': 11.0.0-rc.1 - '@intlify/shared': 11.0.0-rc.1 + '@intlify/message-compiler': 12.0.0-alpha.2 + '@intlify/shared': 12.0.0-alpha.2 acorn: 8.14.0 escodegen: 2.1.0 estree-walker: 2.0.2 @@ -5886,23 +5889,23 @@ snapshots: '@intlify/shared': 10.0.5 source-map-js: 1.2.1 - '@intlify/message-compiler@11.0.0-rc.1': + '@intlify/message-compiler@12.0.0-alpha.2': dependencies: - '@intlify/shared': 11.0.0-rc.1 + '@intlify/shared': 12.0.0-alpha.2 source-map-js: 1.2.1 '@intlify/shared@10.0.5': {} - '@intlify/shared@11.0.0-rc.1': {} + '@intlify/shared@11.1.3': {} - '@intlify/shared@11.1.1': {} + '@intlify/shared@12.0.0-alpha.2': {} '@intlify/unplugin-vue-i18n@6.0.3(@vue/compiler-dom@3.5.13)(eslint@9.21.0(jiti@2.4.2))(rollup@4.34.8)(typescript@5.7.3)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))': dependencies: '@eslint-community/eslint-utils': 4.4.1(eslint@9.21.0(jiti@2.4.2)) '@intlify/bundle-utils': 10.0.0(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3))) - '@intlify/shared': 11.1.1 - '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.1)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3)) + '@intlify/shared': 11.1.3 + '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3)) '@rollup/pluginutils': 5.1.4(rollup@4.34.8) '@typescript-eslint/scope-manager': 8.25.0 '@typescript-eslint/typescript-estree': 8.25.0(typescript@5.7.3) @@ -5926,11 +5929,11 @@ snapshots: '@intlify/utils@0.13.0': {} - '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.1)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))': + '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.3)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))': dependencies: '@babel/parser': 7.26.9 optionalDependencies: - '@intlify/shared': 11.1.1 + '@intlify/shared': 11.1.3 '@vue/compiler-dom': 3.5.13 vue: 3.5.13(typescript@5.7.3) vue-i18n: 10.0.5(vue@3.5.13(typescript@5.7.3)) @@ -10167,9 +10170,9 @@ snapshots: tailwind-merge@3.0.2: {} - tailwindcss-animate@1.0.7(tailwindcss@3.4.17): + tailwindcss-animate@1.0.7(tailwindcss@4.1.4): dependencies: - tailwindcss: 3.4.17 + tailwindcss: 4.1.4 tailwindcss@3.4.17: dependencies: @@ -10198,6 +10201,8 @@ snapshots: transitivePeerDependencies: - ts-node + tailwindcss@4.1.4: {} + tapable@2.2.1: {} tar-stream@3.1.7: