Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
💄 Update button icon styling and positioning (#2262)
Luke Vella8ab44525bb9e
diff --git a/apps/landing/src/components/home/hero.tsx b/apps/landing/src/components/home/hero.tsxindex a97061175..1f6fe381a 100644--- a/apps/landing/src/components/home/hero.tsx+++ b/apps/landing/src/components/home/hero.tsx@@ -116,7 +116,7 @@ export const MarketingHero = ({<Linkhref={linkToApp("/new")}className={buttonVariants({- size: "lg",+ size: "xl",variant: "primary",className:"transition-all hover:shadow-md active:translate-y-1 active:shadow-none",diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsxindex 595f58235..57969d5bc 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx@@ -1,7 +1,6 @@"use client";import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import { InboxIcon, PlusIcon } from "lucide-react";import Link from "next/link";import { useSearchParams } from "next/navigation";@@ -71,9 +70,7 @@ export function PollsPage() {</PageHeaderContent><PageHeaderActions><Link href="/new" className={buttonVariants({ variant: "primary" })}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Trans i18nKey="newPoll" defaults="New Poll" /></Link></PageHeaderActions>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsxindex 74dd9a593..a9e1db9a6 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsx@@ -20,7 +20,7 @@ import {FormLabel,FormMessage,} from "@rallly/ui/form";-import { Icon } from "@rallly/ui/icon";+import { Input } from "@rallly/ui/input";import { toast } from "@rallly/ui/sonner";import { AlertTriangleIcon, CheckIcon, CopyIcon, PlusIcon } from "lucide-react";@@ -73,9 +73,7 @@ export function CreateApiKeyButton() {return (<><Button onClick={() => dialog.trigger()}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Trans i18nKey="createApiKey" defaults="Create API key" /></Button><Dialog {...dialog.dialogProps} onOpenChange={handleClose}>@@ -123,7 +121,7 @@ export function CreateApiKeyButton() {onClick={handleCopy}type="button">- <Icon>{didCopy ? <CheckIcon /> : <CopyIcon />}</Icon>+ {didCopy ? <CheckIcon /> : <CopyIcon />}</Button></div></div>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsxindex 858ab21e3..855d20c3d 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsx@@ -11,7 +11,7 @@ import {DialogHeader,DialogTitle,} from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";+import { Input } from "@rallly/ui/input";import { Label } from "@rallly/ui/label";import { MinusIcon, PlusIcon } from "lucide-react";@@ -85,9 +85,7 @@ function SeatCountSelector({onClick={handleDecrement}disabled={!canDecrement}>- <Icon>- <MinusIcon />- </Icon>+ <MinusIcon data-icon="inline-start" /><span className="sr-only"><Trans i18nKey="decreaseSeats" defaults="Decrease seats" /></span>@@ -108,9 +106,7 @@ function SeatCountSelector({onClick={handleIncrement}disabled={!canIncrement}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><span className="sr-only"><Trans i18nKey="increaseSeats" defaults="Increase seats" /></span>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsxindex 0e5bc4163..944e07235 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsx@@ -7,7 +7,7 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";+import { ChevronDownIcon, PlusIcon } from "lucide-react";import Image from "next/image";import { connectToCalendar } from "@/features/calendars/client";@@ -18,13 +18,9 @@ export function ConnectCalendarDropdown() {<DropdownMenu><DropdownMenuTrigger asChild><Button>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Trans i18nKey="connectCalendar" defaults="Connect Calendar" />- <Icon>- <ChevronDownIcon />- </Icon>+ <ChevronDownIcon data-icon="inline-end" /></Button></DropdownMenuTrigger><DropdownMenuContent align="end">diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsxindex 29e1902a4..181220052 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsx@@ -142,7 +142,7 @@ export function DeleteSpaceButton({ spaceName }: DeleteSpaceButtonProps) {<DeleteSpaceDialog spaceName={spaceName}><DialogTrigger asChild><Button variant="destructive">- <TrashIcon className="size-4" />+ <TrashIcon data-icon="inline-start" /><Trans i18nKey="deleteSpace" defaults="Delete Space" /></Button></DialogTrigger>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsxindex 121b4a53b..bc2ff9452 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsx@@ -20,7 +20,7 @@ import {FormLabel,FormMessage,} from "@rallly/ui/form";-import { Icon } from "@rallly/ui/icon";+import { Input } from "@rallly/ui/input";import { toast } from "@rallly/ui/sonner";import { LogOutIcon } from "lucide-react";@@ -153,9 +153,7 @@ export function LeaveSpaceButton({<LeaveSpaceDialog spaceName={spaceName} spaceId={spaceId}><DialogTrigger asChild><Button>- <Icon>- <LogOutIcon />- </Icon>+ <LogOutIcon data-icon="inline-start" /><Trans i18nKey="leaveSpace" defaults="Leave Space" /></Button></DialogTrigger>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsxindex 34852c731..b3043c1b8 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx@@ -59,7 +59,7 @@ export function MembersSettingsPageClient() {<OptimizedAvatarImagesrc={member.image ?? undefined}name={member.name}- size="lg"+ size="xl"/><div><div className="flex items-center gap-x-2">diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsxindex e8a349f64..dbe5e76a9 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsx@@ -79,7 +79,7 @@ export function ProfilePage() {<DeleteAccountDialog><DialogTrigger asChild><Button variant="destructive">- <TrashIcon className="size-4" />+ <TrashIcon data-icon="inline-start" /><Trans i18nKey="deleteAccount" defaults="Delete Account" /></Button></DialogTrigger>diff --git a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsxindex 73813654c..5c558eff3 100644--- a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx+++ b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx@@ -102,7 +102,7 @@ export function ForgotPasswordForm() {/><div><Button- size="lg"+ size="xl"loading={form.formState.isSubmitting}type="submit"className="w-full"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.tsxindex e6ebe36e7..f7d71b4aa 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@@ -199,7 +199,7 @@ export function LoginWithEmailForm() {) : null}<div><Button- size="lg"+ size="xl"loading={form.formState.isSubmitting}type="submit"className="w-full"diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsxindex c32f540b3..fb1ee4ea0 100644--- a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx@@ -22,7 +22,7 @@ export function LoginWithOIDC({});}}className="w-full"- size="lg"+ size="xl"><Transi18nKey="continueWithProvider"diff --git a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsxindex 2b56c7fe9..f88fd5097 100644--- a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx@@ -49,7 +49,7 @@ export function SSOProvider({const { t } = useTranslation();return (<Button- size="lg"+ size="xl"aria-label={t("continueWithProvider", {provider: name,ns: "app",diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsxindex 0a08dfce0..6630b7960 100644--- a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx@@ -92,7 +92,7 @@ export function OTPForm({ email }: { email: string }) {<ButtonclassName="w-full"variant="primary"- size="lg"+ size="xl"type="submit"loading={form.formState.isSubmitting || form.formState.isSubmitSuccessfuldiff --git a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsxindex 3cfdc7f15..4f02bc8ac 100644--- a/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx+++ b/apps/web/src/app/[locale]/(auth)/login/verify/page.tsx@@ -52,7 +52,7 @@ export default async function VerifyPage() {<Linkhref="/login"className={buttonVariants({- size: "lg",+ size: "xl",variant: "link",className: "w-full",})}diff --git a/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx b/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsxindex 68a84ef06..f7f9dfa3a 100644--- a/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx+++ b/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx@@ -227,7 +227,7 @@ export function RegisterNameForm() {className="w-full"variant="primary"type="submit"- size="lg"+ size="xl"><Trans i18nKey="continue" /></Button>diff --git a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsxindex 63c50b694..238dc38ca 100644--- a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx+++ b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx@@ -114,7 +114,7 @@ export function ResetPasswordForm() {</div><div className="mt-6"><Button- size="lg"+ size="xl"loading={form.formState.isSubmitting}type="submit"className="w-full"diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsxindex b77bf5f94..e9473f001 100644--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx@@ -55,7 +55,7 @@ export default async function JoinPage({<SpaceIconsrc={invite.space.image ?? undefined}name={invite.space.name}- size="lg"+ size="xl"/></div><h1 className="font-bold text-base">diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsxindex 01143ade9..1d40ddba0 100644--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx@@ -9,7 +9,7 @@ import {DialogTitle,DialogTrigger,} from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";+import {KeySquareIcon,PaletteIcon,@@ -190,17 +190,13 @@ export default async function LicensePage() {href="https://support.rallly.co/self-hosting/licensing"className={buttonVariants()}>- <Icon>- <ShoppingBagIcon />- </Icon>+ <ShoppingBagIcon data-icon="inline-start" /><Trans i18nKey="purchaseLicense" defaults="Purchase license" /></a><Dialog><DialogTrigger asChild><Button variant="primary">- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Trans i18nKey="addLicenseKey" defaults="Add license key" /></Button></DialogTrigger>diff --git a/apps/web/src/components/add-to-calendar-button.tsx b/apps/web/src/components/add-to-calendar-button.tsxindex 1a9d5a15e..66bc3b0fe 100644--- a/apps/web/src/components/add-to-calendar-button.tsx+++ b/apps/web/src/components/add-to-calendar-button.tsx@@ -19,9 +19,7 @@ export function AddToCalendarButton({ eventId }: { eventId: string }) {<DropdownMenu><DropdownMenuTrigger asChild><Button>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Trans i18nKey="addToCalendar" defaults="Add to Calendar" /></Button></DropdownMenuTrigger>diff --git a/apps/web/src/components/create-poll.tsx b/apps/web/src/components/create-poll.tsxindex 1dc526a0f..4a83c2553 100644--- a/apps/web/src/components/create-poll.tsx+++ b/apps/web/src/components/create-poll.tsx@@ -130,7 +130,7 @@ export const CreatePoll: React.FunctionComponent = () => {<hr /><Buttonloading={form.formState.isSubmitting}- size="lg"+ size="xl"type="submit"className="w-full"variant="primary"diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsxindex af48875c4..e0013b14a 100644--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx@@ -94,18 +94,22 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({<div><div className="flex w-full flex-col"><div className="mb-3 flex items-center justify-center space-x-4">- <Button title={t("previousMonth")} onClick={datepicker.prev}>- <Icon>- <ChevronLeftIcon />- </Icon>+ <Button+ title={t("previousMonth")}+ size="icon"+ onClick={datepicker.prev}+ >+ <ChevronLeftIcon /></Button><div className="grow text-center font-semibold tracking-tight">{datepicker.label}</div>- <Button title={t("nextMonth")} onClick={datepicker.next}>- <Icon>- <ChevronRightIcon />- </Icon>+ <Button+ title={t("nextMonth")}+ size="icon"+ onClick={datepicker.next}+ >+ <ChevronRightIcon /></Button></div><div className="grid grid-cols-7">@@ -335,9 +339,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({]);}}>- <Icon>- <XIcon />- </Icon>+ <XIcon data-icon="inline-start" /></Button></div>);@@ -372,17 +374,13 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({]);}}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" />{t("addTimeOption")}</Button><DropdownMenu><DropdownMenuTrigger asChild={true}><Button variant="ghost" size="sm">- <Icon>- <MoreHorizontalIcon />- </Icon>+ <MoreHorizontalIcon data-icon="inline-start" /></Button></DropdownMenuTrigger><DropdownMenuContent align="start">diff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/components/invite-dialog.tsxindex d6f17daa0..ac7a950f6 100644--- a/apps/web/src/components/invite-dialog.tsx+++ b/apps/web/src/components/invite-dialog.tsx@@ -8,7 +8,7 @@ import {DialogTitle,DialogTrigger,} from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";+import { ArrowUpRightIcon, Share2Icon } from "lucide-react";import Link from "next/link";import React from "react";@@ -59,9 +59,7 @@ export const InviteDialog = () => {<Dialog open={isOpen} onOpenChange={setIsOpen}><DialogTrigger asChild={true}><Button variant="primary">- <Icon>- <Share2Icon />- </Icon>+ <Share2Icon data-icon="inline-start" /><Trans i18nKey="share" defaults="Share" /></Button></DialogTrigger>diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsxindex 8181de047..ad61b9109 100644--- a/apps/web/src/components/poll/manage-poll.tsx+++ b/apps/web/src/components/poll/manage-poll.tsx@@ -134,15 +134,11 @@ const ManagePoll: React.FunctionComponent<{<DropdownMenu modal={false}><DropdownMenuTrigger asChild={true}><Button variant="ghost" disabled={disabled}>- <Icon>- <SettingsIcon />- </Icon>+ <SettingsIcon data-icon="inline-start" /><span className="hidden sm:block"><Trans i18nKey="manage" /></span>- <Icon>- <ChevronDownIcon />- </Icon>+ <ChevronDownIcon data-icon="inline-end" /></Button></DropdownMenuTrigger><DropdownMenuContent align="end">diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsxindex 6efa88e28..ba8dc9193 100644--- a/apps/web/src/components/poll/mobile-poll.tsx+++ b/apps/web/src/components/poll/mobile-poll.tsx@@ -157,21 +157,18 @@ const MobilePoll: React.FunctionComponent = () => {votingForm.setEditingParticipantId(selectedParticipant.id);}}>- <Button>- <Icon>- <MoreHorizontalIcon />- </Icon>+ <Button size="icon">+ <MoreHorizontalIcon /></Button></ParticipantDropdown>) : canAddNewParticipant ? (<Button+ size="icon"onClick={() => {votingForm.newParticipant();}}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon /></Button>) : null}</div>@@ -214,7 +211,7 @@ const MobilePoll: React.FunctionComponent = () => {className="w-full"type="submit"variant="primary"- size="md"+ size="lg"loading={formState.isSubmitting}>{selectedParticipantId ? t("save") : t("continue")}diff --git a/apps/web/src/components/upgrade-button.tsx b/apps/web/src/components/upgrade-button.tsxindex 8155aaa98..4349e496c 100644--- a/apps/web/src/components/upgrade-button.tsx+++ b/apps/web/src/components/upgrade-button.tsx@@ -29,7 +29,7 @@ export const UpgradeButton = ({value={window.location.pathname}/><Button- size="lg"+ size="xl"className={className}variant="primary"onClick={(e) => {diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsxindex c29626cb4..b8988106d 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/components/user-dropdown.tsx@@ -78,9 +78,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {<Button variant="ghost"><OptimizedAvatarImage src={image} name={name} size="sm" /><span className="truncate">{name}</span>- <Icon>- <ChevronDownIcon />- </Icon>+ <ChevronDownIcon data-icon="inline-end" /></Button></DropdownMenuTrigger><DropdownMenuContent align="end">diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsxindex 2914b289c..436d00500 100644--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx@@ -236,7 +236,7 @@ export function PayWallDialog({</UpgradeButton></TabsContent>) : (- <Button disabled={true} size="lg" className="w-full">+ <Button disabled={true} size="xl" className="w-full"><Trans i18nKey="currentPlan" defaults="Current Plan" /></Button>)}diff --git a/apps/web/src/features/licensing/components/remove-license-button.tsx b/apps/web/src/features/licensing/components/remove-license-button.tsxindex a5a810b78..a599375fb 100644--- a/apps/web/src/features/licensing/components/remove-license-button.tsx+++ b/apps/web/src/features/licensing/components/remove-license-button.tsx@@ -12,7 +12,7 @@ import {DialogTrigger,useDialog,} from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { XIcon } from "lucide-react";import { useTransition } from "react";@@ -30,9 +30,7 @@ export function RemoveLicenseButton() {<TooltipTrigger asChild><DialogTrigger asChild><Button variant="ghost" onClick={() => dialog.trigger()}>- <Icon>- <XIcon />- </Icon>+ <XIcon data-icon="inline-start" /><span className="sr-only"><Trans i18nKey="removeLicense" defaults="Remove License" /></span>diff --git a/apps/web/src/features/quick-create/quick-create-widget.tsx b/apps/web/src/features/quick-create/quick-create-widget.tsxindex 58f0b32ce..8fd921b03 100644--- a/apps/web/src/features/quick-create/quick-create-widget.tsx+++ b/apps/web/src/features/quick-create/quick-create-widget.tsx@@ -1,5 +1,4 @@import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import { CheckIcon, PlusIcon, ZapIcon } from "lucide-react";import Link from "next/link";import { Trans } from "react-i18next/TransWithoutContext";@@ -70,11 +69,9 @@ export async function QuickCreateWidget() {<div><Linkhref="/new"- className={buttonVariants({ size: "lg", className: "w-full" })}+ className={buttonVariants({ size: "xl", className: "w-full" })}>- <Icon size="lg">- <PlusIcon />- </Icon>+ <PlusIcon data-icon="inline-start" /><Transt={t}ns="app"diff --git a/packages/ui/src/button-variants.ts b/packages/ui/src/button-variants.tsindex 5058cd6d8..9d44da150 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 font-normal text-sm 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",),{variants: {@@ -20,16 +20,18 @@ export const buttonVariants = cva(link: "border-transparent text-primary underline-offset-4 hover:underline",},size: {- default: "h-8 gap-x-1.5 rounded-lg px-2 text-sm",- sm: "h-7 gap-x-1.5 rounded-md px-1.5 text-sm",- md: "h-9 gap-x-2 rounded-md px-2 text-sm",- lg: "h-12 gap-x-3 rounded-lg px-4 text-base",- icon: "size-7 gap-x-1.5 rounded-lg text-sm",- "icon-lg": "size-8 rounded-full",+ default:+ "h-8 gap-1.5 px-2.5 text-sm has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",+ 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",+ 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","icon-sm":"size-7 in-data-[slot=button-group]:rounded-lg rounded-[min(var(--radius-md),12px)]",+ "icon-lg": "size-9",},},defaultVariants: {diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsxindex c732c796b..198193ad5 100644--- a/packages/ui/src/button.tsx+++ b/packages/ui/src/button.tsx@@ -37,10 +37,12 @@ const Button = ({{...props}>{loading ? (- <Loader2Icon className="size-4 animate-spin opacity-75" />- ) : (- children- )}+ <Loader2Icon+ data-icon="inline-start"+ className="size-4 animate-spin opacity-75"+ />+ ) : null}+ {children}</ButtonPrimitive>);};