Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔗 refactor: Use the Bare and Wide Button Sizes in the Account Settings Dialogs (#16834)
Marco Berettaf630975a7d26
diff --git a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsxindex 564d40c814..be59d3edf9 100644--- a/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx@@ -182,7 +182,7 @@ const BackupCodesItem: React.FC = () => {onClick={handleRegenerate}disabled={isLoading || !otpReady}variant="default"- className="px-8 py-3 transition-all disabled:opacity-50"+ size="wide">{isLoading ? (<Spinner className="mr-2" />@@ -201,7 +201,7 @@ const BackupCodesItem: React.FC = () => {onClick={handleRegenerate}disabled={isLoading || !otpReady}variant="default"- className="px-8 py-3 transition-all disabled:opacity-50"+ size="wide">{isLoading && <Spinner className="mr-2" />}{localize('com_ui_regenerate_backup')}@@ -247,7 +247,7 @@ const BackupCodesItem: React.FC = () => {setUseBackup(!useBackup);setOtpToken('');}}- className="text-text-primary h-auto p-0 text-sm hover:underline"+ size="bare">{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}</Button>diff --git a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsxindex c92ee79d39..681eb003cb 100644--- a/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx@@ -138,7 +138,8 @@ const DeleteAccount = ({ disabled = false }: { title?: string; disabled?: booleasetUseBackup(!useBackup);setOtpToken('');}}- className="text-text-primary h-auto p-0 text-sm font-normal hover:underline"+ size="bare"+ className="font-normal">{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}</Button>diff --git a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsxindex c1acda7926..ae0372bda6 100644--- a/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx+++ b/client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx@@ -70,12 +70,7 @@ export const DisablePhase: React.FC<DisablePhaseProps> = ({ onDisable, isDisabli{isDisabling && <Spinner className="mr-2" />}{isDisabling ? localize('com_ui_disabling') : localize('com_ui_2fa_disable')}</Button>- <Button- type="button"- variant="link"- onClick={() => setUseBackup(!useBackup)}- className="text-text-primary h-auto p-0 text-sm hover:underline"- >+ <Button type="button" variant="link" onClick={() => setUseBackup(!useBackup)} size="bare">{useBackup ? localize('com_ui_use_2fa_code') : localize('com_ui_use_backup_code')}</Button></motion.div>diff --git a/eslint-suppressions.json b/eslint-suppressions.jsonindex ff8557a183..144c42dd84 100644--- a/eslint-suppressions.json+++ b/eslint-suppressions.json@@ -1048,12 +1048,12 @@},"client/src/components/Nav/SettingsTabs/Account/BackupCodesItem.tsx": {"shadcn/no-restyle": {- "count": 15+ "count": 3}},"client/src/components/Nav/SettingsTabs/Account/DeleteAccount.tsx": {"shadcn/no-restyle": {- "count": 21+ "count": 17}},"client/src/components/Nav/SettingsTabs/Account/TwoFactorAuthentication.tsx": {@@ -1068,7 +1068,7 @@},"client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/DisablePhase.tsx": {"shadcn/no-restyle": {- "count": 10+ "count": 6}},"client/src/components/Nav/SettingsTabs/Account/TwoFactorPhases/QRPhase.tsx": {diff --git a/packages/client/src/components/Button.spec.tsx b/packages/client/src/components/Button.spec.tsxindex 190a5bab90..716f9ce82a 100644--- a/packages/client/src/components/Button.spec.tsx+++ b/packages/client/src/components/Button.spec.tsx@@ -361,6 +361,7 @@ describe('Button', () => {it('offers the sign-in sizes, shape and link variants as roles rather than caller classes', () => {expect(cn(buttonVariants({ shape: 'soft' }))).toContain('rounded-2xl');expect(cn(buttonVariants({ size: 'snug' }))).toContain('p-1');+ expect(cn(buttonVariants({ size: 'wide' }))).toContain('px-8');expect(cn(buttonVariants({ size: 'bare' }))).toContain('p-0');expect(cn(buttonVariants({ variant: 'link-accent' }))).toContain('text-accent-primary');expect(cn(buttonVariants({ variant: 'hyperlink' }))).toContain('text-link');diff --git a/packages/client/src/components/Button.tsx b/packages/client/src/components/Button.tsxindex 60cae516ee..41d1426715 100644--- a/packages/client/src/components/Button.tsx+++ b/packages/client/src/components/Button.tsx@@ -43,6 +43,7 @@ type ButtonVariantOptions =| 'xs'| 'sm'| 'lg'+ | 'wide'| 'snug'| 'bare'| 'theme'@@ -196,6 +197,8 @@ const buttonVariantRecipe = cva(xs: 'h-theme-button-xs rounded-md px-2.5 text-xs',sm: 'h-theme-button-sm rounded-lg px-3',lg: 'h-theme-button-lg rounded-lg px-8',+ /** Default height with the generous pad of a dialog's confirming action. */+ wide: 'h-theme-button px-8',/** Default height with a snug pad, for a text action that sits close to its neighbors. */snug: 'h-theme-button p-1',/** Sized by its own text with no pad, for an action set inside a sentence. */