Skip to content

Commit 95e8293

Browse files
committed
clean global css and use standard convention using utility classes to style components
1 parent 4cb9221 commit 95e8293

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

src/styles/global.css

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,4 @@
213213
samp {
214214
@apply font-monospace text-base leading-base;
215215
}
216-
}
217-
218-
@layer components {
219-
.accordion-trigger {
220-
@apply flex flex-1 items-center justify-between gap-2 px-2 py-2 font-medium transition-all hover:bg-background-highlight hover:text-primary-hover focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-primary-hover md:px-4 [&[data-state=open]>svg]:-rotate-90 [&[data-state=open]]:bg-background-highlight [&[data-state=open]]:text-primary-high-contrast;
221-
}
222-
.accordion-content {
223-
@apply overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down;
224-
}
225-
226-
.accordion-indicator {
227-
@apply size-[1em] shrink-0 text-2xl transition-transform duration-200;
228-
}
229-
}
216+
}

tailwind/ui/accordion.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ const AccordionItem = React.forwardRef<
1010
React.ElementRef<typeof AccordionPrimitive.Item>,
1111
React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Item>
1212
>(({ className, ...props }, ref) => (
13-
<AccordionPrimitive.Item ref={ref} className={className} {...props} />
13+
<AccordionPrimitive.Item
14+
ref={ref}
15+
className={className}
16+
{...props}
17+
/>
1418
))
1519
AccordionItem.displayName = "AccordionItem"
1620

@@ -21,11 +25,14 @@ const AccordionTrigger = React.forwardRef<
2125
<AccordionPrimitive.Header className="flex">
2226
<AccordionPrimitive.Trigger
2327
ref={ref}
24-
className={cn("accordion-trigger", className)}
28+
className={cn(
29+
"flex flex-1 items-center justify-between gap-2 px-2 py-2 font-medium transition-all hover:bg-background-highlight hover:text-primary-hover focus-visible:outline-1 focus-visible:-outline-offset-1 focus-visible:outline-primary-hover md:px-4 [&[data-state=open]>svg]:-rotate-90 [&[data-state=open]]:bg-background-highlight [&[data-state=open]]:text-primary-high-contrast",
30+
className
31+
)}
2532
{...props}
2633
>
2734
{children}
28-
<MdChevronRight className="accordion-indicator" />
35+
<MdChevronRight className="size-[1em] shrink-0 text-2xl transition-transform duration-200" />
2936
</AccordionPrimitive.Trigger>
3037
</AccordionPrimitive.Header>
3138
))
@@ -37,7 +44,7 @@ const AccordionContent = React.forwardRef<
3744
>(({ className, children, ...props }, ref) => (
3845
<AccordionPrimitive.Content
3946
ref={ref}
40-
className={"accordion-content"}
47+
className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
4148
{...props}
4249
>
4350
<div className={cn("p-2 md:p-4", className)}>{children}</div>
@@ -46,4 +53,4 @@ const AccordionContent = React.forwardRef<
4653

4754
AccordionContent.displayName = AccordionPrimitive.Content.displayName
4855

49-
export { Accordion, AccordionContent, AccordionItem, AccordionTrigger }
56+
export { Accordion, AccordionContent,AccordionItem, AccordionTrigger }

0 commit comments

Comments
 (0)