Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(style): add xl button for onboarding (#5997)
Seamus06c81cf6b3e2
diff --git a/apps/web/src/components/ui/components/Button.test.tsx b/apps/web/src/components/ui/components/Button.test.tsxindex 46018c2294..941bd73511 100644--- a/apps/web/src/components/ui/components/Button.test.tsx+++ b/apps/web/src/components/ui/components/Button.test.tsx@@ -47,6 +47,7 @@ describe('buttonClasses', () => {['sm', 'h-6', 'px-2', 'text-xs', 'size-3'],['md', 'h-8', 'px-2', 'text-sm', 'size-3.5'],['lg', 'h-9', 'px-3', 'text-base', 'size-[1em]'],+ ['xl', 'h-12', 'px-4', 'text-base', 'size-5'],] as const)('gives %s buttons the intended height, padding, text size, and icon size',(size, heightClass, paddingClass, textClass, iconClass) => {diff --git a/apps/web/src/components/ui/components/Button.tsx b/apps/web/src/components/ui/components/Button.tsxindex f2e5e77954..c3345c24a2 100644--- a/apps/web/src/components/ui/components/Button.tsx+++ b/apps/web/src/components/ui/components/Button.tsx@@ -49,6 +49,7 @@ export const buttonVariants = createVariants(sm: CONTROL_SIZE_VARIANTS.sm,md: CONTROL_SIZE_VARIANTS.md,lg: `${CONTROL_SIZE_VARIANTS.lg} rounded-lg`,+ xl: "h-12 gap-2 px-4 text-base rounded-lg [&>svg:not([class*='size-'])]:size-5",'icon-lg':"size-11 aspect-square p-2 [&>svg:not([class*='size-'])]:size-7",'icon-md':diff --git a/apps/web/src/components/ui/components/ButtonGroup.tsx b/apps/web/src/components/ui/components/ButtonGroup.tsxindex 9bb740911b..8a8bdea6b4 100644--- a/apps/web/src/components/ui/components/ButtonGroup.tsx+++ b/apps/web/src/components/ui/components/ButtonGroup.tsx@@ -51,6 +51,7 @@ const dividerVariantStyles: Record<ButtonVariant, string> = {const groupHorizontalSize: Record<ButtonSize, string> = {xs: '','icon-xs': 'h-5',+ xl: 'h-12',lg: '',md: '',sm: 'h-6',@@ -62,6 +63,7 @@ const groupHorizontalSize: Record<ButtonSize, string> = {const groupVerticalSize: Record<ButtonSize, string> = {xs: '','icon-xs': 'w-5',+ xl: '',lg: '',md: '',sm: '',diff --git a/apps/web/src/features/auth/Login.tsx b/apps/web/src/features/auth/Login.tsxindex c267d8e073..b73a561e19 100644--- a/apps/web/src/features/auth/Login.tsx+++ b/apps/web/src/features/auth/Login.tsx@@ -124,25 +124,32 @@ function LoginPicker(props: {<div class="flex flex-col gap-3"><Buttonvariant="cta"+ size="xl"autofocusonClick={() => startSsoLogin(GOOGLE_GMAIL_IDP)}>- <IconGoogle />+ <IconGoogle class="size-5" />Continue with Google</Button><Show when={showApple}><Buttonvariant="outline"+ size="xl"class="bg-surface"onClick={() => startSsoLogin('Apple')}>- <IconApple />+ <IconApple class="size-5" />Continue with Apple</Button></Show>- <Button variant="outline" class="bg-surface" onClick={continueWithEmail}>+ <Button+ variant="outline"+ size="xl"+ class="bg-surface"+ onClick={continueWithEmail}+ >Continue with email</Button></div>@@ -264,12 +271,22 @@ function EmailFormNew(props: {/></Show><FormError msg={submission.error?.message} />- <Button variant="cta" type="submit" disabled={submission.pending}>+ <Button+ variant="cta"+ size="xl"+ type="submit"+ disabled={submission.pending}+ >Continue- <ArrowRight class="size-4" />+ <ArrowRight class="size-5" /></Button>- <Button variant="outline" class="bg-surface" onClick={props.onBack}>- <ArrowLeft class="size-4" />+ <Button+ variant="outline"+ size="xl"+ class="bg-surface"+ onClick={props.onBack}+ >+ <ArrowLeft class="size-5" />Back to sign in</Button></form>@@ -437,14 +454,20 @@ function VerifyFormNew(props: {gate submission here instead of round-tripping partial codes. */}<Buttonvariant="cta"+ size="xl"type="submit"disabled={submission.pending || code().length !== 6 || !email()}>Verify- <ArrowRight class="size-4" />+ <ArrowRight class="size-5" /></Button>- <Button variant="outline" class="bg-surface" onClick={props.onBack}>- <ArrowLeft class="size-4" />+ <Button+ variant="outline"+ size="xl"+ class="bg-surface"+ onClick={props.onBack}+ >+ <ArrowLeft class="size-5" />Change email</Button></form>diff --git a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsxindex b60eae8d90..3e78560daa 100644--- a/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/MobileAuthWelcome.tsx@@ -43,13 +43,13 @@ export function MobileAuthWelcome() {<div class="flex flex-col gap-3 px-8 pb-8"><Buttonvariant="strong"- size="lg"+ size="xl"onClick={() => navigate('/onboarding')}>Create new account</Button><Button- size="lg"+ size="xl"class="border border-edge-muted"onClick={() => navigate('/login')}>diff --git a/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx b/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsxindex 9469983ecb..c97539154f 100644--- a/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/MobileOnboarding.tsx@@ -107,7 +107,7 @@ export function MobileOnboarding() {<div class="mx-auto w-full max-w-md shrink-0 px-6 pt-6 pb-6"><Buttonvariant="strong"- size="lg"+ size="xl"class="w-full"onClick={onContinue}>diff --git a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsxindex a603d3b3ae..5a77b549c0 100644--- a/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/OnboardingConnectAccounts.tsx@@ -110,12 +110,12 @@ export function OnboardingConnectAccounts() {<div class="flex flex-col gap-2"><Buttonvariant="strong"- size="lg"+ size="xl"class="border border-edge-muted"disabled={!isAuthenticated()}onClick={() => void addInbox()}>- <IconGoogle />+ <IconGoogle class="size-5" />Connect Another Gmail</Button><p class="text-sm/relaxed text-ink-muted">@@ -128,14 +128,14 @@ export function OnboardingConnectAccounts() {<div class="flex flex-col gap-2"><Buttonvariant="strong"- size="lg"+ size="xl"class="border border-edge-muted"disabled={!isAuthenticated() || githubLinked() || initGithubLink.isPending}onClick={() => void connectGithub()}>- <GithubIcon />+ <GithubIcon class="size-5" />{githubLinked() ? 'GitHub Connected' : 'Connect GitHub'}</Button><p class="text-sm/relaxed text-ink-muted">diff --git a/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx b/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsxindex 2fda3cd5b4..6ed13b6ba2 100644--- a/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx+++ b/apps/web/src/features/auth/mobile-onboarding/OnboardingCreateAccount.tsx@@ -33,10 +33,10 @@ export function OnboardingCreateAccount() {<div class="flex flex-col gap-2 pt-2"><Buttonvariant="strong"- size="lg"+ size="xl"onClick={() => startSsoLogin(GOOGLE_GMAIL_IDP)}>- <IconGoogle />+ <IconGoogle class="size-5" />Connect Gmail</Button><buttondiff --git a/apps/web/src/features/onboarding/InteractiveOnboardingModal.tsx b/apps/web/src/features/onboarding/InteractiveOnboardingModal.tsxindex b6a300baff..a2f2e1eaed 100644--- a/apps/web/src/features/onboarding/InteractiveOnboardingModal.tsx+++ b/apps/web/src/features/onboarding/InteractiveOnboardingModal.tsx@@ -86,7 +86,7 @@ function StartScreen(props: { onStart: () => void; onSkip: () => void }) {</p></div><div class="w-full max-w-xs flex flex-col gap-2 pt-2">- <Button variant="cta" size="lg" onClick={props.onSkip}>+ <Button variant="cta" size="xl" onClick={props.onSkip}>Continue<ArrowRightIcon /></Button>@@ -101,11 +101,11 @@ function StartScreen(props: { onStart: () => void; onSkip: () => void }) {</p></div><div class="w-full max-w-xs flex flex-col gap-2 pt-2">- <Button variant="cta" size="lg" onClick={props.onStart}>+ <Button variant="cta" size="xl" onClick={props.onStart}>Play tutorial<ArrowRightIcon /></Button>- <Button variant="ghost" size="lg" onClick={props.onSkip}>+ <Button variant="ghost" size="xl" onClick={props.onSkip}>Skip tutorial</Button></div>@@ -127,11 +127,11 @@ function EndScreen(props: { onFinish: () => void; onReplay: () => void }) {</p></div><div class="w-full max-w-xs flex flex-col gap-2 pt-2">- <Button variant="cta" size="lg" onClick={props.onFinish}>+ <Button variant="cta" size="xl" onClick={props.onFinish}>Let’s go<ArrowRightIcon /></Button>- <Button variant="ghost" size="lg" onClick={props.onReplay}>+ <Button variant="ghost" size="xl" onClick={props.onReplay}>Replay tutorial</Button></div>@@ -160,7 +160,7 @@ function ModalFooter(props: { lesson: LessonState }) {<div class="flex items-center justify-end gap-2 shrink-0"><Buttonvariant="ghost"- size="lg"+ size="xl"onClick={onboarding.handleSkipLesson}>Skip lesson@@ -168,7 +168,7 @@ function ModalFooter(props: { lesson: LessonState }) {<Buttonref={onboarding.setContinueButtonRef}variant="cta"- size="lg"+ size="xl"onClick={onboarding.handleContinue}disabled={!onboarding.readyToContinue()}>diff --git a/apps/web/src/features/setup/flow/PlanStep.tsx b/apps/web/src/features/setup/flow/PlanStep.tsxindex 84b979ceee..24d60b3aa5 100644--- a/apps/web/src/features/setup/flow/PlanStep.tsx+++ b/apps/web/src/features/setup/flow/PlanStep.tsx@@ -89,11 +89,12 @@ export function PlanStep(props: {</div><Buttonvariant="cta"+ size="xl"disabled={props.finishing}onClick={() => props.onPremiumPaid()}>{props.finishing ? 'Setting up your workspace…' : 'Continue'}- <ArrowRight class="size-4" />+ <ArrowRight class="size-5" /></Button></div>}@@ -155,13 +156,18 @@ export function PlanStep(props: {</div><div class="flex flex-col gap-3">- <Button variant="cta" disabled={props.finishing} onClick={finish}>+ <Button+ variant="cta"+ size="xl"+ disabled={props.finishing}+ onClick={finish}+ >{props.finishing? selected() === 'free'? 'Setting up your workspace…': 'Heading to checkout…': `Continue with ${selected() === 'free' ? 'Free' : 'Premium'}`}- <ArrowRight class="size-4" />+ <ArrowRight class="size-5" /></Button><SkipButtonlabel="Decide later"diff --git a/apps/web/src/features/setup/flow/shared.tsx b/apps/web/src/features/setup/flow/shared.tsxindex 92ab662b8f..bc2d061582 100644--- a/apps/web/src/features/setup/flow/shared.tsx+++ b/apps/web/src/features/setup/flow/shared.tsx@@ -135,9 +135,14 @@ export function ContinueButton(props: {onClick: () => void;}) {return (- <Button variant="cta" disabled={props.disabled} onClick={props.onClick}>+ <Button+ variant="cta"+ size="xl"+ disabled={props.disabled}+ onClick={props.onClick}+ >{props.label ?? 'Continue'}- <ArrowRight class="size-4" />+ <ArrowRight class="size-5" /></Button>);}diff --git a/apps/web/src/lib/core/internal/ThemeDebug.tsx b/apps/web/src/lib/core/internal/ThemeDebug.tsxindex 130279b877..bb893bcf86 100644--- a/apps/web/src/lib/core/internal/ThemeDebug.tsx+++ b/apps/web/src/lib/core/internal/ThemeDebug.tsx@@ -35,12 +35,14 @@ const BUTTON_VARIANTS = ['cta',] as const;const BUTTON_CONTENT_VARIANTS = ['outline', 'accent', 'strong', 'cta'] as const;-const BUTTON_SIZES = ['sm', 'md', 'lg'] as const;+const BUTTON_SIZES = ['sm', 'md', 'lg', 'xl'] as const;+const BADGE_SIZES = ['sm', 'md', 'lg'] as const;const BADGE_VARIANTS = ['ghost', 'outline'] as const;const BUTTON_SIZE_LABELS = {sm: 'Small',md: 'Default',lg: 'Large',+ xl: 'Extra Large',} as const;function ThemeDebug() {@@ -366,7 +368,7 @@ function ThemeDebug() {</Badge></div></div>- <For each={BUTTON_SIZES}>+ <For each={BADGE_SIZES}>{(size) => (<div class="flex flex-col items-start gap-2"><span class="text-xs text-ink-extra-muted font-mono">