From 4875fcd160d5fb52cf2914eaf554e677e0c974de Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Sun, 8 Nov 2026 11:00:14 -0800 Subject: [PATCH] fix(toasts): match toast action buttons to Orca's Button --- src/renderer/src/assets/main.css | 32 +++++++++++++++++++ .../claude-theme-sync-offer.ts | 4 +-- src/renderer/src/i18n/locales/en.json | 4 +-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index 996f314de67..d7cb95929b8 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -588,6 +588,38 @@ body[data-modal-overlay-open] [data-toasts-raised] [data-sonner-toaster] { margin-left: 0; } +/* Why: Sonner's 24px buttons with untokened fills don't match Orca; mirror Button size="sm" default/secondary. */ +[data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-button] { + height: 2rem; + padding: 0 0.75rem; + border-radius: calc(var(--radius) - 2px); + font-size: 0.875rem; + font-weight: 500; + background: var(--primary); + color: var(--primary-foreground); + transition: + opacity 0.4s, + box-shadow 0.2s, + background-color 150ms; +} + +[data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-button]:hover { + background: color-mix(in oklab, var(--primary) 90%, transparent); +} + +[data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-button][data-cancel] { + background: var(--secondary); + color: var(--secondary-foreground); +} + +[data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-button][data-cancel]:hover { + background: color-mix(in oklab, var(--secondary) 80%, transparent); +} + +[data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-button]:focus-visible { + box-shadow: 0 0 0 3px color-mix(in oklab, var(--ring) 50%, transparent); +} + [data-sonner-toaster] [data-sonner-toast][data-styled='true'] [data-title] { line-height: 1.35; } diff --git a/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts b/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts index f3e546a353e..8e49967f640 100644 --- a/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts +++ b/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts @@ -27,7 +27,7 @@ function showClaudeThemeSyncOffer(): void { duration: Infinity, classNames: TRAILING_ACTIONS_CLASS_NAMES, action: { - label: translate('terminal.claudeThemeSyncOffer.accept', 'Match Theme'), + label: translate('terminal.claudeThemeSyncOffer.accept', 'Match theme'), onClick: () => { // Why confirm only after the write: a failed save must not claim the sync is on. updateSettingsOrThrow({ claudeCodeThemeSync: true }).then( @@ -58,7 +58,7 @@ function showClaudeThemeSyncOffer(): void { } }, cancel: { - label: translate('terminal.claudeThemeSyncOffer.decline', 'No Thanks'), + label: translate('terminal.claudeThemeSyncOffer.decline', 'No thanks'), onClick: () => {} } }) diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index daac77282ca..da6289db69e 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -22342,10 +22342,10 @@ "claudeThemeSyncOffer": { "title": "Match Claude Code to your Orca theme?", "description": "Claude Code on this computer would use your terminal colors and follow theme changes, including outside Orca. You can change this in Settings.", - "accept": "Match Theme", + "accept": "Match theme", "accepted": "Claude Code theme sync is on", "acceptedDescription": "New Claude Code sessions on this computer use your Orca theme.", - "decline": "No Thanks", + "decline": "No thanks", "failed": "Could not turn on Claude Code theme sync", "failedDescription": "Turn it on in Settings." }