Skip to content

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

💄 Update styles

Luke Vella19b721f43792
diff --git a/apps/web/src/components/clock.tsx b/apps/web/src/components/clock.tsx
index 801eaffe2..c35fa68a5 100644
--- a/apps/web/src/components/clock.tsx
+++ b/apps/web/src/components/clock.tsx
@@ -1,5 +1,6 @@
"use client";
import { cn } from "@rallly/ui";
+import { Button } from "@rallly/ui/button";
import {
Dialog,
DialogContent,
@@ -79,17 +80,14 @@ export const TimesShownIn = () => {
const { timezone } = useTimezone();
return (
<ClockPreferences>
- <button
- type="button"
- className="inline-flex items-center gap-x-2.5 text-sm hover:underline"
- >
- <GlobeIcon className="size-4" />
+ <Button type="button" variant="ghost">
+ <GlobeIcon data-icon="inline-start" />
<Trans
i18nKey="cityTime"
defaults="{city} Time"
values={{ city: getCityFromTimezoneId(timezone) }}
/>
- </button>
+ </Button>
</ClockPreferences>
);
};
diff --git a/packages/ui/src/button-variants.ts b/packages/ui/src/button-variants.ts
index 628cd7192..a4bbc1c77 100644
--- a/packages/ui/src/button-variants.ts
+++ b/packages/ui/src/button-variants.ts
@@ -4,7 +4,7 @@ import { cn } from "./lib/utils";
export const buttonVariants = cva(
cn(
- "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-lg font-normal outline-none transition-opacity focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 active:opacity-90 active:shadow-none disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ "inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-lg font-normal outline-none transition-opacity focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 active:opacity-90 active:shadow-none disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg]:opacity-90",
),
{
variants: {
@@ -25,7 +25,7 @@ export const buttonVariants = cva(
xs: "h-6 gap-1 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),10px)] px-2 text-sm text-xs has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
sm: "h-7 gap-1 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),12px)] px-2.5 text-[0.8rem] text-sm has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5",
lg: "h-10 gap-1.5 px-2.5 text-sm has-data-[icon=inline-end]:pr-3 has-data-[icon=inline-start]:pl-3",
- xl: "h-12 gap-1.5 px-2.5 text-base has-data-[icon=inline-end]:pr-3 has-data-[icon=inline-start]:pl-3",
+ xl: "h-12 gap-2 px-3 text-base has-data-[icon=inline-end]:pr-4 has-data-[icon=inline-start]:pl-4",
icon: "size-8",
"icon-xs":
"size-6 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),10px)] [&_svg:not([class*='size-'])]:size-3",