diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx index f61552521e2..a710bd7ebf0 100644 --- a/packages/desktop-client/src/components/Notifications.tsx +++ b/packages/desktop-client/src/components/Notifications.tsx @@ -110,7 +110,7 @@ function Notification({ color: positive ? theme.alt4NoticeText : error - ? theme.alt3ErrorText + ? theme.errorTextDark : theme.alt4WarningText, }} > @@ -129,7 +129,7 @@ function Notification({ positive ? theme.altNoticeAccent : error - ? theme.altErrorAccent + ? theme.errorBorder : theme.altWarningAccent }`, ...styles.shadowLarge, @@ -175,7 +175,7 @@ function Notification({ positive ? theme.altNoticeAccent : error - ? theme.altErrorAccent + ? theme.errorBorder : theme.altWarningAccent }`, color: 'currentColor', @@ -185,7 +185,7 @@ function Notification({ backgroundColor: positive ? theme.noticeBackground : error - ? theme.altErrorBackground + ? theme.errorBackground : theme.altWarningBackground, }, }} diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx index 77a51757b1c..bb61a9739a8 100644 --- a/packages/desktop-client/src/components/Titlebar.tsx +++ b/packages/desktop-client/src/components/Titlebar.tsx @@ -151,7 +151,7 @@ export function SyncButton({ style, isMobile = false }: SyncButtonProps) { const mobileColor = syncState === 'error' - ? theme.alt4ErrorText + ? theme.errorText : syncState === 'disabled' || syncState === 'offline' || syncState === 'local' @@ -159,7 +159,7 @@ export function SyncButton({ style, isMobile = false }: SyncButtonProps) { : style.color; const desktopColor = syncState === 'error' - ? theme.alt2ErrorText + ? theme.errorTextDark : syncState === 'disabled' || syncState === 'offline' || syncState === 'local' diff --git a/packages/desktop-client/src/components/alerts.tsx b/packages/desktop-client/src/components/alerts.tsx index f7a67e4f5c1..464922f28af 100644 --- a/packages/desktop-client/src/components/alerts.tsx +++ b/packages/desktop-client/src/components/alerts.tsx @@ -93,8 +93,8 @@ export const Error = ({ style, children }: ScopedAlertProps) => { return ( {children} diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js index 0533135d5f7..fa06fcd4ba2 100644 --- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js +++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js @@ -100,7 +100,7 @@ function Saved({ projected }) { color: projected ? theme.alt2WarningText : isNegative - ? theme.alt2ErrorText + ? theme.errorTextDark : theme.formInputText, }} > diff --git a/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx index ebf6d1c782c..dd73e6fac72 100644 --- a/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx +++ b/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx @@ -282,7 +282,7 @@ function Saved({ projected, style }: SavedProps) { color: projected ? theme.alt2WarningText : isNegative - ? theme.alt2ErrorText + ? theme.errorTextDark : theme.altUpcomingText, }, ])}`} diff --git a/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx index 99e5f7621df..9959da029f5 100644 --- a/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx +++ b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx @@ -190,7 +190,7 @@ function ToBudget({ borderBottom: '1px solid transparent', ':hover': { borderColor: isNegative - ? theme.errorText + ? theme.errorBorder : theme.pageTextPositive, }, }, diff --git a/packages/desktop-client/src/components/schedules/StatusBadge.tsx b/packages/desktop-client/src/components/schedules/StatusBadge.tsx index d0b7ae84cba..32906bc6bf5 100644 --- a/packages/desktop-client/src/components/schedules/StatusBadge.tsx +++ b/packages/desktop-client/src/components/schedules/StatusBadge.tsx @@ -20,8 +20,8 @@ export function getStatusProps(status: StatusTypes) { switch (status) { case 'missed': return { - color: theme.altErrorText, - backgroundColor: theme.altErrorBackground, + color: theme.errorTextDarker, + backgroundColor: theme.errorBackground, Icon: EditSkull1, }; case 'due': diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.js index 893cbf6cdbe..f4cbeb2e2cf 100644 --- a/packages/desktop-client/src/components/transactions/MobileTransaction.js +++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js @@ -156,7 +156,7 @@ function Status({ status }) { switch (status) { case 'missed': - color = theme.alt3ErrorText; + color = theme.errorText; break; case 'due': color = theme.alt2WarningText; diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.js b/packages/desktop-client/src/components/transactions/TransactionsTable.js index 22c6918a5dd..6e5c7359a34 100644 --- a/packages/desktop-client/src/components/transactions/TransactionsTable.js +++ b/packages/desktop-client/src/components/transactions/TransactionsTable.js @@ -418,7 +418,7 @@ function StatusCell({ status === 'cleared' ? theme.noticeText : status === 'missed' - ? theme.alt5ErrorText + ? theme.errorText : status === 'due' ? theme.alt3WarningText : selected @@ -1043,7 +1043,7 @@ const Transaction = memo(function Transaction(props) { style={{ color: notes === 'missed' - ? theme.alt5ErrorText + ? theme.errorText : notes === 'due' ? theme.alt5WarningText : selected @@ -1051,7 +1051,7 @@ const Transaction = memo(function Transaction(props) { : theme.altTableText, backgroundColor: notes === 'missed' - ? theme.altErrorBackground + ? theme.errorBackground : notes === 'due' ? theme.altWarningBackground : selected diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.ts index 24fb0464cd3..2875c54ec11 100644 --- a/packages/desktop-client/src/style/themes/dark.ts +++ b/packages/desktop-client/src/style/themes/dark.ts @@ -169,11 +169,11 @@ export const alt2WarningText = warningText; export const alt3WarningText = warningText; export const warningAccent = colorPalette.orange500; export const errorBackground = colorPalette.red800; -export const altErrorBackground = errorBackground; export const errorText = colorPalette.red200; -export const altErrorText = errorText; -export const alt2ErrorText = errorText; -export const errorAccent = colorPalette.red500; +export const errorTextDark = errorText; +export const errorTextDarker = errorText; +export const errorTextMenu = colorPalette.red500; +export const errorBorder = colorPalette.red500; export const upcomingBackground = tableBackground; export const upcomingText = tableTextInactive; export const altUpcomingText = upcomingText; diff --git a/packages/desktop-client/src/style/themes/development.ts b/packages/desktop-client/src/style/themes/development.ts index 8d8cca113c3..602089c062f 100644 --- a/packages/desktop-client/src/style/themes/development.ts +++ b/packages/desktop-client/src/style/themes/development.ts @@ -156,12 +156,12 @@ export const altWarningText = warningText; export const alt2WarningText = warningText; export const alt3WarningText = warningText; export const warningAccent = colorPalette.orange500; -export const errorBackground = colorPalette.red800; -export const altErrorBackground = errorBackground; -export const errorText = colorPalette.red200; -export const altErrorText = errorText; -export const alt2ErrorText = errorText; -export const errorAccent = colorPalette.red500; +export const errorBackground = colorPalette.red100; +export const errorText = colorPalette.red500; +export const errorTextDark = colorPalette.red700; +export const errorTextDarker = colorPalette.red900; +export const errorTextMenu = colorPalette.red200; +export const errorBorder = colorPalette.red500; export const upcomingBackground = colorPalette.purple100; export const upcomingText = colorPalette.purple900; export const altUpcomingText = colorPalette.purple500; diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.ts index 5d2ec7fcf11..d67fae39697 100644 --- a/packages/desktop-client/src/style/themes/light.ts +++ b/packages/desktop-client/src/style/themes/light.ts @@ -178,16 +178,12 @@ export const alt4WarningText = colorPalette.orange800; export const alt5WarningText = colorPalette.orange600; export const warningAccent = colorPalette.orange400; export const altWarningAccent = colorPalette.orange600; -export const errorBackground = colorPalette.red50; -export const altErrorBackground = colorPalette.red100; +export const errorBackground = colorPalette.red100; export const errorText = colorPalette.red500; -export const altErrorText = colorPalette.red900; -export const alt2ErrorText = colorPalette.red600; -export const alt3ErrorText = colorPalette.red700; -export const alt4ErrorText = colorPalette.red300; -export const alt5ErrorText = colorPalette.red400; -export const errorAccent = colorPalette.red200; -export const altErrorAccent = colorPalette.red500; +export const errorTextDark = colorPalette.red700; +export const errorTextDarker = colorPalette.red900; +export const errorTextMenu = colorPalette.red200; +export const errorBorder = colorPalette.red500; export const upcomingBackground = colorPalette.purple100; export const upcomingText = colorPalette.purple900; export const altUpcomingText = colorPalette.purple500;