Skip to content

Commit bf60670

Browse files
chore: fix cn with tw-merge (#3789)
* chore: fix cn * chore: fix scale
1 parent 8a481b6 commit bf60670

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

apps/sim/components/emcn/components/button/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { cva, type VariantProps } from 'class-variance-authority'
33
import { cn } from '@/lib/core/utils/cn'
44

55
const buttonVariants = cva(
6-
'inline-flex items-center justify-center font-medium transition-colors active:scale-[0.97] disabled:pointer-events-none disabled:opacity-70 outline-none focus:outline-none focus-visible:outline-none rounded-[5px]',
6+
'inline-flex items-center justify-center font-medium transition-colors active:scale-[0.98] disabled:pointer-events-none disabled:opacity-70 outline-none focus:outline-none focus-visible:outline-none rounded-[5px]',
77
{
88
variants: {
99
variant: {

apps/sim/lib/core/utils/cn.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
import { type ClassValue, clsx } from 'clsx'
2-
import { twMerge } from 'tailwind-merge'
2+
import { extendTailwindMerge } from 'tailwind-merge'
3+
4+
const twMerge = extendTailwindMerge({
5+
extend: {
6+
classGroups: {
7+
'font-size': [{ text: ['micro', 'caption', 'small', 'md'] }],
8+
},
9+
},
10+
})
311

412
/**
513
* Combines class names using clsx and tailwind-merge

0 commit comments

Comments
 (0)