diff --git a/internal/lint-configs/eslint-config/src/custom-config.ts b/internal/lint-configs/eslint-config/src/custom-config.ts index 6bf19610..4ddf2d38 100644 --- a/internal/lint-configs/eslint-config/src/custom-config.ts +++ b/internal/lint-configs/eslint-config/src/custom-config.ts @@ -2,7 +2,7 @@ import type { Linter } from 'eslint'; const customConfig: Linter.FlatConfig[] = [ { - files: ['packages/@vben-core/uikit/shadcn-ui/**/**'], + files: ['packages/@core/uikit/shadcn-ui/**/**'], rules: { 'vue/require-default-prop': 'off', }, diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue index 95318ecd..2778b0d0 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/alert-dialog/AlertDialogContent.vue @@ -35,7 +35,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'bg-background 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-1/2 top-1/2 z-[1000] grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg', + 'bg-background 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] border-border fixed left-1/2 top-1/2 z-[1000] grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg', props.class, ) " diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/badge/badge.ts b/packages/@core/uikit/shadcn-ui/src/components/ui/badge/badge.ts index 0968ed0d..a8af0f18 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/badge/badge.ts +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/badge/badge.ts @@ -1,7 +1,7 @@ import { type VariantProps, cva } from 'class-variance-authority'; export const badgeVariants = cva( - 'inline-flex items-center rounded-md 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-md border border-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', { defaultVariants: { variant: 'default', diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue index 32283752..1e5cebf6 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuContent.vue @@ -31,7 +31,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'bg-popover text-popover-foreground 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-[1000] min-w-32 overflow-hidden rounded-md border p-1 shadow-md', + 'bg-popover text-popover-foreground 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 border-border z-[1000] min-w-32 overflow-hidden rounded-md border p-1 shadow-md', props.class, ) " diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue index bf1bebc6..987b8dbc 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/context-menu/ContextMenuSubContent.vue @@ -29,7 +29,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'bg-popover text-popover-foreground 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 min-w-32 overflow-hidden rounded-md border p-1 shadow-lg', + 'bg-popover text-popover-foreground 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 border-border z-50 min-w-32 overflow-hidden rounded-md border p-1 shadow-lg', props.class, ) " diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue index 7f54593d..d50b1ae6 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogContent.vue @@ -38,7 +38,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); v-bind="forwarded" :class=" cn( - 'bg-background 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] fixed left-1/2 top-1/2 z-[1000] grid w-full -translate-x-1/2 -translate-y-1/2 gap-4 border p-6 shadow-lg outline-none duration-300 sm:rounded-lg', + 'bg-background 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] border-border fixed left-1/2 top-1/2 z-[1000] grid w-full -translate-x-1/2 -translate-y-1/2 gap-4 border p-6 shadow-lg outline-none duration-300 sm:rounded-lg', props.class, ) " diff --git a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue index e3da5698..fd9b88bc 100644 --- a/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue +++ b/packages/@core/uikit/shadcn-ui/src/components/ui/dialog/DialogScrollContent.vue @@ -30,7 +30,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);