From 0531f0c73bad655bda9b1c4a56475a5678c58534 Mon Sep 17 00:00:00 2001 From: "hrynevych.romann" Date: Fri, 12 Jan 2024 23:41:08 +0200 Subject: [PATCH] refactor(tailwindcss): remove all unnecessary arbitrary values, update TailwindCSS to v3.4 --- apps/www/.vitepress/theme/components/Kbd.vue | 6 +- .../.vitepress/theme/layout/MainLayout.vue | 4 +- apps/www/.vitepress/theme/style.css | 6 +- apps/www/package.json | 2 +- .../src/content/docs/components/skeleton.md | 4 +- .../examples/cards/components/GitHubCard.vue | 4 +- .../forms/components/AppearanceForm.vue | 4 +- apps/www/src/examples/playground/Example.vue | 2 +- .../src/examples/tasks/components/columns.ts | 6 +- .../lib/registry/default/example/CardDemo.vue | 2 +- .../registry/default/example/CardStats.vue | 4 +- .../default/example/NavigationMenuDemo.vue | 2 +- .../registry/default/example/ProgressDemo.vue | 2 +- .../registry/default/example/SliderDemo.vue | 2 +- .../ui/alert-dialog/AlertDialogContent.vue | 2 +- .../ui/context-menu/ContextMenuContent.vue | 2 +- .../ui/context-menu/ContextMenuSubContent.vue | 2 +- .../default/ui/dialog/DialogContent.vue | 2 +- .../ui/dropdown-menu/DropdownMenuContent.vue | 2 +- .../dropdown-menu/DropdownMenuSubContent.vue | 2 +- .../default/ui/menubar/MenubarContent.vue | 2 +- .../default/ui/menubar/MenubarSubContent.vue | 2 +- .../navigation-menu/NavigationMenuTrigger.vue | 2 +- .../NavigationMenuViewport.vue | 2 +- .../default/ui/scroll-area/ScrollBar.vue | 4 +- .../default/ui/select/SelectContent.vue | 4 +- .../lib/registry/default/ui/switch/Switch.vue | 2 +- .../registry/default/ui/textarea/Textarea.vue | 2 +- .../lib/registry/default/ui/toast/index.ts | 2 +- .../registry/new-york/example/CardDemo.vue | 2 +- .../registry/new-york/example/CardStats.vue | 4 +- .../new-york/example/NavigationMenuDemo.vue | 2 +- .../new-york/example/ProgressDemo.vue | 2 +- .../registry/new-york/example/SliderDemo.vue | 2 +- .../ui/alert-dialog/AlertDialogContent.vue | 2 +- .../ui/context-menu/ContextMenuContent.vue | 2 +- .../ui/context-menu/ContextMenuSubContent.vue | 2 +- .../new-york/ui/dialog/DialogContent.vue | 2 +- .../ui/dropdown-menu/DropdownMenuContent.vue | 2 +- .../dropdown-menu/DropdownMenuSubContent.vue | 2 +- .../new-york/ui/menubar/MenubarContent.vue | 2 +- .../new-york/ui/menubar/MenubarSubContent.vue | 2 +- .../navigation-menu/NavigationMenuTrigger.vue | 2 +- .../NavigationMenuViewport.vue | 2 +- .../new-york/ui/scroll-area/ScrollBar.vue | 4 +- .../new-york/ui/select/SelectContent.vue | 4 +- .../registry/new-york/ui/switch/Switch.vue | 2 +- .../registry/new-york/ui/table/TableCell.vue | 2 +- .../registry/new-york/ui/table/TableHead.vue | 2 +- .../lib/registry/new-york/ui/toast/index.ts | 2 +- .../registry/styles/default/alert-dialog.json | 2 +- .../registry/styles/default/calendar.json | 2 +- .../registry/styles/default/context-menu.json | 4 +- .../registry/styles/default/data-table.json | 4 +- .../registry/styles/default/dialog.json | 2 +- .../styles/default/dropdown-menu.json | 4 +- .../public/registry/styles/default/kbd.json | 4 +- .../registry/styles/default/menubar.json | 4 +- .../styles/default/navigation-menu.json | 4 +- .../registry/styles/default/scroll-area.json | 2 +- .../registry/styles/default/select.json | 2 +- .../registry/styles/default/switch.json | 2 +- .../registry/styles/default/textarea.json | 2 +- .../public/registry/styles/default/toast.json | 2 +- .../styles/new-york/alert-dialog.json | 2 +- .../registry/styles/new-york/calendar.json | 2 +- .../styles/new-york/context-menu.json | 4 +- .../registry/styles/new-york/dialog.json | 2 +- .../styles/new-york/dropdown-menu.json | 4 +- .../registry/styles/new-york/menubar.json | 4 +- .../styles/new-york/navigation-menu.json | 4 +- .../registry/styles/new-york/scroll-area.json | 2 +- .../registry/styles/new-york/select.json | 2 +- .../registry/styles/new-york/switch.json | 2 +- .../registry/styles/new-york/table.json | 4 +- .../registry/styles/new-york/toast.json | 2 +- .../ui/alert-dialog/AlertDialogContent.vue | 2 +- pnpm-lock.yaml | 314 ++++++++---------- 78 files changed, 247 insertions(+), 275 deletions(-) diff --git a/apps/www/.vitepress/theme/components/Kbd.vue b/apps/www/.vitepress/theme/components/Kbd.vue index 7e3bd02c..55428107 100644 --- a/apps/www/.vitepress/theme/components/Kbd.vue +++ b/apps/www/.vitepress/theme/components/Kbd.vue @@ -18,9 +18,9 @@ const kbdClass = computed(() => { { variants: { size: { - xs: 'min-h-[16px] text-[10px] h-4 px-1', - sm: 'min-h-[20px] text-[11px] h-5 px-1', - md: 'min-h-[24px] text-[12px] h-6 px-1.5', + xs: 'min-h-4 text-[10px] h-4 px-1', + sm: 'min-h-5 text-[11px] h-5 px-1', + md: 'min-h-6 text-[12px] h-6 px-1.5', }, }, }, diff --git a/apps/www/.vitepress/theme/layout/MainLayout.vue b/apps/www/.vitepress/theme/layout/MainLayout.vue index 23bc4121..c8600b84 100644 --- a/apps/www/.vitepress/theme/layout/MainLayout.vue +++ b/apps/www/.vitepress/theme/layout/MainLayout.vue @@ -134,7 +134,7 @@ watch(() => $route.path, (n) => { :href="link.href" target="_blank" :variant="'ghost'" :size="'icon'" > - + diff --git a/apps/www/.vitepress/theme/style.css b/apps/www/.vitepress/theme/style.css index c1b2d159..238dc1c4 100644 --- a/apps/www/.vitepress/theme/style.css +++ b/apps/www/.vitepress/theme/style.css @@ -116,7 +116,7 @@ .step:before { @apply absolute w-9 h-9 bg-muted rounded-full font-mono font-medium text-center text-base inline-flex items-center justify-center -indent-px border-4 border-background; - @apply ml-[-50px] mt-[-4px]; + @apply -ml-[50px] -mt-1; content: counter(step); } } @@ -139,7 +139,7 @@ pre code { } pre code .line { - @apply px-4 min-h-[1.5rem] !py-0.5 w-full inline-block; + @apply px-4 min-h-6 !py-0.5 w-full inline-block; } .line-number { @@ -149,4 +149,4 @@ pre code .line { ::view-transition-old(root), ::view-transition-new(root) { animation-duration: 0.3s; -} \ No newline at end of file +} diff --git a/apps/www/package.json b/apps/www/package.json index d717a69d..6eded3e8 100644 --- a/apps/www/package.json +++ b/apps/www/package.json @@ -57,7 +57,7 @@ "pathe": "^1.1.1", "rimraf": "^5.0.5", "tailwind-merge": "^2.0.0", - "tailwindcss": "^3.3.5", + "tailwindcss": "^3.4.1", "tsx": "^4.7.0", "typescript": "^5.2.2", "unplugin-icons": "^0.17.1", diff --git a/apps/www/src/content/docs/components/skeleton.md b/apps/www/src/content/docs/components/skeleton.md index af07e1b8..628ba177 100644 --- a/apps/www/src/content/docs/components/skeleton.md +++ b/apps/www/src/content/docs/components/skeleton.md @@ -37,6 +37,6 @@ import { Skeleton } from '@/components/ui/skeleton' -``` \ No newline at end of file +``` diff --git a/apps/www/src/examples/cards/components/GitHubCard.vue b/apps/www/src/examples/cards/components/GitHubCard.vue index 62c7b3a4..30450833 100644 --- a/apps/www/src/examples/cards/components/GitHubCard.vue +++ b/apps/www/src/examples/cards/components/GitHubCard.vue @@ -26,7 +26,7 @@ import { Separator } from '@/lib/registry/new-york/ui/separator' diff --git a/apps/www/src/lib/registry/default/ui/alert-dialog/AlertDialogContent.vue b/apps/www/src/lib/registry/default/ui/alert-dialog/AlertDialogContent.vue index 8af818b9..a30bd0f8 100644 --- a/apps/www/src/lib/registry/default/ui/alert-dialog/AlertDialogContent.vue +++ b/apps/www/src/lib/registry/default/ui/alert-dialog/AlertDialogContent.vue @@ -24,7 +24,7 @@ const emitsAsProps = useEmitAsProps(emits) v-bind="{ ...props, ...emitsAsProps }" :class=" cn( - 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-border bg-background p-6 shadow-lg duration-200 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%] sm:rounded-lg md:w-full', + 'fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border border-border bg-background p-6 shadow-lg duration-200 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%] sm:rounded-lg md:w-full', props.class, ) " diff --git a/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuContent.vue b/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuContent.vue index 4e201ff0..c16167e3 100644 --- a/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuContent.vue +++ b/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuContent.vue @@ -20,7 +20,7 @@ const forwarded = useForwardPropsEmits(props, emits) :align-offset="props.alignOffset" :class="[ cn( - 'z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md animate-in fade-in-80 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 bg-popover p-1 text-popover-foreground shadow-md animate-in fade-in-80 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/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuSubContent.vue b/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuSubContent.vue index bfdf27bf..457da2cf 100644 --- a/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuSubContent.vue +++ b/apps/www/src/lib/registry/default/ui/context-menu/ContextMenuSubContent.vue @@ -18,7 +18,7 @@ const forwarded = useForwardPropsEmits(props, emits) v-bind="forwarded" :class=" cn( - 'z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md 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 bg-popover p-1 text-popover-foreground shadow-md 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/apps/www/src/lib/registry/default/ui/dialog/DialogContent.vue b/apps/www/src/lib/registry/default/ui/dialog/DialogContent.vue index c8b64caa..8109c4f9 100644 --- a/apps/www/src/lib/registry/default/ui/dialog/DialogContent.vue +++ b/apps/www/src/lib/registry/default/ui/dialog/DialogContent.vue @@ -25,7 +25,7 @@ const emitsAsProps = useEmitAsProps(emits) diff --git a/apps/www/src/lib/registry/default/ui/menubar/MenubarContent.vue b/apps/www/src/lib/registry/default/ui/menubar/MenubarContent.vue index 8b0dab3c..40130664 100644 --- a/apps/www/src/lib/registry/default/ui/menubar/MenubarContent.vue +++ b/apps/www/src/lib/registry/default/ui/menubar/MenubarContent.vue @@ -27,7 +27,7 @@ const props = withDefaults( :align-offset="props.alignOffset" :class=" cn( - 'z-50 min-w-[12rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in 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-48 overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in 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/apps/www/src/lib/registry/default/ui/menubar/MenubarSubContent.vue b/apps/www/src/lib/registry/default/ui/menubar/MenubarSubContent.vue index cd52f2f0..304a12ac 100644 --- a/apps/www/src/lib/registry/default/ui/menubar/MenubarSubContent.vue +++ b/apps/www/src/lib/registry/default/ui/menubar/MenubarSubContent.vue @@ -29,7 +29,7 @@ const emits = defineEmits() :align-offset="props.alignOffset" :class=" cn( - 'z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 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 bg-popover p-1 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', props.class, ) " diff --git a/apps/www/src/lib/registry/default/ui/navigation-menu/NavigationMenuTrigger.vue b/apps/www/src/lib/registry/default/ui/navigation-menu/NavigationMenuTrigger.vue index 08634ccd..714230fa 100644 --- a/apps/www/src/lib/registry/default/ui/navigation-menu/NavigationMenuTrigger.vue +++ b/apps/www/src/lib/registry/default/ui/navigation-menu/NavigationMenuTrigger.vue @@ -17,7 +17,7 @@ const props = defineProps() >