Skip to content

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

💄 Add a rounded button shape and use it on the login page

Luke Vella69c4d6fa33f6
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
index 2145a437b..780320dbb 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
@@ -295,6 +295,7 @@ export function LoginWithEmailForm({
<div>
<Button
size="xl"
+ shape="rounded"
loading={form.formState.isSubmitting}
type="submit"
className="relative w-full"
diff --git a/apps/web/src/features/auth/components/login-with-oidc.tsx b/apps/web/src/features/auth/components/login-with-oidc.tsx
index 45658581b..50c5c239d 100644
--- a/apps/web/src/features/auth/components/login-with-oidc.tsx
+++ b/apps/web/src/features/auth/components/login-with-oidc.tsx
@@ -25,6 +25,7 @@ export function LoginWithOIDC({
}}
className="relative w-full"
size="xl"
+ shape="rounded"
>
{name}
{isLastUsed ? <LastUsedBadge /> : null}
diff --git a/apps/web/src/features/auth/components/sso-provider.tsx b/apps/web/src/features/auth/components/sso-provider.tsx
index 766c58594..59c58a6ad 100644
--- a/apps/web/src/features/auth/components/sso-provider.tsx
+++ b/apps/web/src/features/auth/components/sso-provider.tsx
@@ -53,6 +53,7 @@ export function SSOProvider({
return (
<Button
size="xl"
+ shape="rounded"
className="relative"
key={providerId}
onClick={() => {
diff --git a/apps/web/src/features/quick-create/components/quick-create-widget.tsx b/apps/web/src/features/quick-create/components/quick-create-widget.tsx
index 89c811de2..84774f382 100644
--- a/apps/web/src/features/quick-create/components/quick-create-widget.tsx
+++ b/apps/web/src/features/quick-create/components/quick-create-widget.tsx
@@ -72,7 +72,11 @@ export async function QuickCreateWidget() {
<div>
<Link
href="/new"
- className={buttonVariants({ size: "xl", className: "w-full" })}
+ className={buttonVariants({
+ size: "xl",
+ shape: "rounded",
+ className: "w-full",
+ })}
>
<PlusIcon data-icon="inline-start" />
<Trans
diff --git a/packages/ui/src/button-variants.ts b/packages/ui/src/button-variants.ts
index bb445206d..f43df6cd1 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(
- "group inline-flex shrink-0 items-center justify-center whitespace-nowrap rounded-full font-normal tracking-tight transition-[background-color,color,transform] ease-out [-webkit-tap-highlight-color:transparent] 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",
+ "group inline-flex shrink-0 items-center justify-center whitespace-nowrap font-normal tracking-tight transition-[background-color,color,transform] ease-out [-webkit-tap-highlight-color:transparent] 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: {
@@ -33,10 +33,15 @@ export const buttonVariants = cva(
"icon-sm": "size-7",
"icon-lg": "size-10",
},
+ shape: {
+ pill: "rounded-full",
+ rounded: "rounded-xl",
+ },
},
defaultVariants: {
variant: "default",
size: "default",
+ shape: "pill",
},
},
);
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index 3fc044555..a8ebcb2a6 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -21,6 +21,7 @@ const Button = ({
children,
variant,
size,
+ shape,
...props
}: ButtonPrimitive.Props &
VariantProps<typeof buttonVariants> & { loading?: boolean }) => {
@@ -29,7 +30,7 @@ const Button = ({
<ButtonPrimitive
className={cn(
"group",
- buttonVariants({ variant, size }),
+ buttonVariants({ variant, size, shape }),
{
"pointer-events-none": loading,
"[&_svg:not([data-slot=spinner])]:hidden": loading && isIconButton,