Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Update tabs and buttons

Luke Vellac17c8300cdc4
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index d7e7685ea..69b29c2bf 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -16,15 +16,15 @@ const buttonVariants = cva(
variants: {
variant: {
primary:
- "border-primary bg-primary text-white hover:bg-primary-500 focus-visible:ring-offset-1 disabled:border-transparent disabled:bg-gray-400",
+ "border-primary bg-primary text-white focus-visible:ring-2 focus-visible:ring-gray-300 focus-visible:ring-offset-1 active:bg-primary-500 disabled:border-transparent disabled:bg-gray-400",
destructive:
"border-destructive bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90 focus-visible:ring-offset-1 active:bg-destructive",
default:
- "bg-gray-50 hover:bg-gray-100 focus-visible:ring-offset-1 active:bg-gray-200",
+ "bg-white hover:bg-gray-50 focus-visible:ring-offset-1 active:bg-gray-100",
secondary:
"border-secondary bg-secondary text-secondary-foreground hover:bg-secondary/80 focus-visible:ring-offset-1",
ghost:
- "border-transparent bg-transparent text-gray-800 hover:bg-gray-500/10 focus:ring-2 focus:ring-gray-200 active:bg-gray-500/20 data-[state=open]:bg-gray-500/20",
+ "border-transparent bg-transparent text-gray-800 hover:bg-gray-500/10 focus-visible:ring-2 focus-visible:ring-gray-200 active:bg-gray-500/20 data-[state=open]:bg-gray-500/20",
actionBar:
"border-transparent bg-action-bar text-action-bar-foreground hover:bg-action-bar-foreground/10 data-[state=open]:bg-action-bar-foreground/20",
link: "border-transparent text-primary underline-offset-4 hover:underline",
diff --git a/packages/ui/src/tabs.tsx b/packages/ui/src/tabs.tsx
index 9abf3a615..126f83e9a 100644
--- a/packages/ui/src/tabs.tsx
+++ b/packages/ui/src/tabs.tsx
@@ -14,7 +14,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List
ref={ref}
className={cn(
- "inline-flex h-9 items-center justify-center rounded-md border bg-muted text-muted-foreground",
+ "inline-flex h-8 items-center justify-center rounded-lg border bg-muted text-muted-foreground",
className,
)}
{...props}
@@ -29,7 +29,7 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger
ref={ref}
className={cn(
- "inline-flex h-full items-center justify-center whitespace-nowrap rounded px-3 font-medium text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:ring-1 data-[state=active]:ring-gray-200",
+ "inline-flex h-full items-center justify-center whitespace-nowrap rounded-lg px-3 font-medium text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:ring-1 data-[state=active]:ring-gray-200",
className,
)}
{...props}