Skip to content

chore: fix cn with tw-merge #3789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 2 commits into from
Mar 26, 2026
+10 −2
Merged

chore: fix cn with tw-merge #3789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b86b4bd
chore: fix cn
adithyaakrishna Mar 26, 2026
06d140f
chore: fix scale
adithyaakrishna Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/sim/components/emcn/components/button/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cva, type VariantProps } from 'class-variance-authority'
import { cn } from '@/lib/core/utils/cn'

const buttonVariants = cva(
'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]',
'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]',
{
variants: {
variant: {
Expand Down
10 changes: 9 additions & 1 deletion apps/sim/lib/core/utils/cn.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import { type ClassValue, clsx } from 'clsx'
import { twMerge } from 'tailwind-merge'
import { extendTailwindMerge } from 'tailwind-merge'

const twMerge = extendTailwindMerge({
extend: {
classGroups: {
'font-size': [{ text: ['micro', 'caption', 'small', 'md'] }],
},
},
})

/**
* Combines class names using clsx and tailwind-merge
Expand Down
Loading