diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png index e4d5cacd719..ebc5ed1f828 100644 Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png differ diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx index f1775be3410..0459cc9062b 100644 --- a/packages/desktop-client/src/components/LoggedInUser.tsx +++ b/packages/desktop-client/src/components/LoggedInUser.tsx @@ -78,7 +78,7 @@ export default function LoggedInUser({ return ( @@ -129,7 +129,7 @@ function Notification({ positive ? theme.noticeBorder : error - ? theme.altErrorAccent + ? theme.errorBorder : theme.altWarningAccent }`, ...styles.shadowLarge, @@ -175,7 +175,7 @@ function Notification({ positive ? theme.noticeBorder : 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 8b0e593a1e5..c60fb9e388f 100644 --- a/packages/desktop-client/src/components/Titlebar.tsx +++ b/packages/desktop-client/src/components/Titlebar.tsx @@ -152,7 +152,7 @@ export function SyncButton({ style, isMobile = false }: SyncButtonProps) { const mobileColor = syncState === 'error' - ? theme.alt4ErrorText + ? theme.errorText : syncState === 'disabled' || syncState === 'offline' || syncState === 'local' @@ -160,7 +160,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/UpdateNotification.tsx b/packages/desktop-client/src/components/UpdateNotification.tsx index 7e844e02999..95b4051adee 100644 --- a/packages/desktop-client/src/components/UpdateNotification.tsx +++ b/packages/desktop-client/src/components/UpdateNotification.tsx @@ -36,7 +36,7 @@ export default function UpdateNotification() { bottom: 0, right: 0, margin: '15px 17px', - backgroundColor: theme.altPageTextPositive, + backgroundColor: theme.pageTextPositive, color: theme.tableBackground, padding: '7px 10px', borderRadius: 4, diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.js b/packages/desktop-client/src/components/accounts/MobileAccounts.js index 573bc9040b0..2fcd1705300 100644 --- a/packages/desktop-client/src/components/accounts/MobileAccounts.js +++ b/packages/desktop-client/src/components/accounts/MobileAccounts.js @@ -23,7 +23,7 @@ function AccountHeader({ name, amount, style = {} }) { flex: '1 0 auto', flexDirection: 'row', marginTop: 10, - color: theme.altpageTextSubdued, + color: theme.pageTextLight, ...style, }} > @@ -143,7 +143,7 @@ function EmptyMessage({ onAdd }) { Add Account - + In the future, you can add accounts using the add button in the header. 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/autocomplete/PayeeAutocomplete.js b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js index 9f2a8cd41ad..1f2cb6abdfa 100644 --- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js +++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js @@ -186,7 +186,7 @@ function PayeeList({ style={{ fontSize: isNarrowWidth ? 'inherit' : 11, padding: 5, - color: theme.altpageTextSubdued, + color: theme.pageTextLight, textAlign: 'center', }} > diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.js b/packages/desktop-client/src/components/budget/BudgetTotals.js index 0f66ddc40e1..5f2fa3079ff 100644 --- a/packages/desktop-client/src/components/budget/BudgetTotals.js +++ b/packages/desktop-client/src/components/budget/BudgetTotals.js @@ -56,7 +56,7 @@ const BudgetTotals = memo(function BudgetTotals({ {menuOpen && ( diff --git a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx b/packages/desktop-client/src/components/budget/MonthCountSelector.tsx index d3baecf087b..25137630cc5 100644 --- a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx +++ b/packages/desktop-client/src/components/budget/MonthCountSelector.tsx @@ -42,9 +42,7 @@ export function MonthCountSelector({ calendars.push( = i ? theme.altpageTextSubdued : theme.altButtonBareText - } + color={maxMonths >= i ? theme.pageTextLight : theme.altButtonBareText} onClick={() => onChange(i)} />, ); diff --git a/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/report/BudgetSummary.tsx index 8df2bb776ff..816f2dc7633 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, }, ])}`} @@ -407,7 +407,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) { {menuOpen && ( 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/manager/WelcomeScreen.js b/packages/desktop-client/src/components/manager/WelcomeScreen.js index 53125f8d2f2..4d34b235d67 100644 --- a/packages/desktop-client/src/components/manager/WelcomeScreen.js +++ b/packages/desktop-client/src/components/manager/WelcomeScreen.js @@ -48,7 +48,7 @@ export default function WelcomeScreen() { to help you get your bearings, and check out the rest of the documentation while you’re there to learn more about advanced topics. - + Get started by importing an existing budget file from Actual or another budgeting app, or start fresh with an empty budget. You can always create or import another budget later. diff --git a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx index 349cc4a221d..99899a0f86f 100644 --- a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx +++ b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx @@ -110,7 +110,7 @@ function CreateLocalAccount({ modalProps, actions }: CreateLocalAccountProps) { style={{ textAlign: 'right', fontSize: '0.7em', - color: theme.altpageTextSubdued, + color: theme.pageTextLight, marginTop: 3, }} > diff --git a/packages/desktop-client/src/components/modals/EditRule.js b/packages/desktop-client/src/components/modals/EditRule.js index 603bc30cb8b..296ece82af3 100644 --- a/packages/desktop-client/src/components/modals/EditRule.js +++ b/packages/desktop-client/src/components/modals/EditRule.js @@ -283,7 +283,7 @@ function ScheduleDescription({ id }) { diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx index 51263a18a8e..f5739966f4e 100644 --- a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx +++ b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx @@ -35,7 +35,10 @@ function CashFlowGraph({ graphData, isConcise }: CashFlowGraphProps) { } > - + } labels={x => x.premadeLabel} style={{ - data: { stroke: theme.altpageTextSubdued }, + data: { stroke: theme.pageTextLight }, }} /> @@ -634,7 +634,7 @@ export default function ScheduleDetails({ modalProps, actions, id }) { {state.isCustom && (