diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png index 6669b2bbd0..42c2d82590 100644 Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png index 8f652deabd..70dc1b3989 100644 Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png index d9091286c7..cc8f379a21 100644 Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png differ diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.tsx b/packages/desktop-client/src/components/budget/BudgetCategories.tsx index 69b360bc8f..32c7a6cce6 100644 --- a/packages/desktop-client/src/components/budget/BudgetCategories.tsx +++ b/packages/desktop-client/src/components/budget/BudgetCategories.tsx @@ -241,7 +241,7 @@ export const BudgetCategories = memo( ( case 'new-group': content = ( ( @@ -392,7 +392,7 @@ export const BudgetCategories = memo( dragState ? {} : { - ':hover': { backgroundColor: theme.tableBackground }, + ':hover': { backgroundColor: theme.budgetCurrentMonth }, } } > diff --git a/packages/desktop-client/src/components/budget/BudgetTable.tsx b/packages/desktop-client/src/components/budget/BudgetTable.tsx index 2ed16956fe..f32d99fbd8 100644 --- a/packages/desktop-client/src/components/budget/BudgetTable.tsx +++ b/packages/desktop-client/src/components/budget/BudgetTable.tsx @@ -229,7 +229,8 @@ export function BudgetTable(props: BudgetTableProps) { backgroundColor: 'transparent', }, '& ::-webkit-scrollbar-thumb:vertical': { - backgroundColor: theme.tableHeaderBackground, + backgroundColor: theme.pageTextSubdued, + // changed from tableHeaderBackground. pageTextSubdued is always visible on pageBackground }, }), }} diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.tsx b/packages/desktop-client/src/components/budget/BudgetTotals.tsx index 67d02502d0..647e11a8f1 100644 --- a/packages/desktop-client/src/components/budget/BudgetTotals.tsx +++ b/packages/desktop-client/src/components/budget/BudgetTotals.tsx @@ -63,7 +63,7 @@ export const BudgetTotals = memo(function BudgetTotals({ diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx index 0594d7e048..21fbbab0c4 100644 --- a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx +++ b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx @@ -81,7 +81,7 @@ export function ExpenseCategory({ innerRef={dropRef} collapsed style={{ - backgroundColor: theme.tableBackground, + backgroundColor: theme.budgetCurrentMonth, opacity: cat.hidden || categoryGroup?.hidden ? 0.5 : undefined, }} > diff --git a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx index 3b2243b618..1c5ca09cf2 100644 --- a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx +++ b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx @@ -95,7 +95,7 @@ export function ExpenseGroup({ style={{ fontWeight: 600, opacity: group.hidden ? 0.33 : undefined, - backgroundColor: theme.tableRowHeaderBackground, + backgroundColor: theme.budgetHeaderCurrentMonth, //use budget colors }} > {dragState && !dragState.preview && dragState.type === 'group' && ( diff --git a/packages/desktop-client/src/components/budget/IncomeGroup.tsx b/packages/desktop-client/src/components/budget/IncomeGroup.tsx index fb4fa3cf4a..0b56d50c07 100644 --- a/packages/desktop-client/src/components/budget/IncomeGroup.tsx +++ b/packages/desktop-client/src/components/budget/IncomeGroup.tsx @@ -37,7 +37,7 @@ export function IncomeGroup({ collapsed style={{ fontWeight: 600, - backgroundColor: theme.tableRowHeaderBackground, + backgroundColor: theme.budgetHeaderCurrentMonth, //use budget color }} > @@ -140,6 +141,7 @@ export function IncomeHeaderMonth() { color: theme.tableHeaderText, alignItems: 'center', paddingRight: 10, + backgroundColor: theme.budgetCurrentMonth, }} > @@ -307,6 +309,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({ setBudgetMenuOpen(true); }} style={{ + color: theme.budgetNumberNeutral, //make sure button is visible when hovered padding: 3, }} > @@ -380,8 +383,8 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({ padding: '0 4px', borderRadius: 4, ':hover': { - boxShadow: 'inset 0 0 0 1px ' + theme.mobileAccountShadow, - backgroundColor: theme.tableBackground, + boxShadow: 'inset 0 0 0 1px ' + theme.pageTextSubdued, //remove mobile color variable + backgroundColor: theme.budgetCurrentMonth, }, }} valueProps={{ @@ -396,7 +399,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({ onEdit(null); }, style: { - backgroundColor: theme.tableBackground, + backgroundColor: theme.budgetCurrentMonth, }, }} onSave={(parsedIntegerAmount: number | null) => { diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx index fc48ce50c2..7e63a0153b 100644 --- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx +++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetSummary.tsx @@ -116,7 +116,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => { width={13} height={13} // The margin is to make it the exact same size as the dots button - style={{ color: theme.tableTextLight, margin: 1 }} + style={{ color: theme.pageTextLight, margin: 1 }} /> @@ -151,7 +151,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => { width={15} height={15} tooltipPosition="bottom right" - defaultColor={theme.tableTextLight} + defaultColor={theme.pageTextLight} /> @@ -254,7 +254,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => { alignItems: 'center', padding: '10px 20px', justifyContent: 'space-between', - backgroundColor: theme.tableBackground, + backgroundColor: theme.budgetCurrentMonth, borderTop: '1px solid ' + theme.tableBorder, }} > @@ -272,7 +272,7 @@ export const BudgetSummary = memo(({ month }: BudgetSummaryProps) => { style={{ padding: '5px 0', marginTop: 17, - backgroundColor: theme.tableRowHeaderBackground, + backgroundColor: theme.budgetHeaderCurrentMonth, borderTopWidth: 1, borderBottomWidth: 1, borderColor: theme.tableBorder, diff --git a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx index 98dc0a30be..d93a4feeb4 100644 --- a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx +++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx @@ -74,7 +74,7 @@ const headerLabelStyle: CSSProperties = { }; const cellStyle: CSSProperties = { - color: theme.pageTextLight, + color: theme.tableHeaderText, fontWeight: 600, }; @@ -90,7 +90,7 @@ export const BudgetTotalsMonth = memo(function BudgetTotalsMonth() { }} > - + Budgeted - + Spent @@ -109,7 +109,7 @@ export const BudgetTotalsMonth = memo(function BudgetTotalsMonth() { - + Balance - + Budgeted - + Received @@ -287,6 +287,7 @@ export const CategoryMonth = memo(function CategoryMonth({ variant="bare" onPress={() => setMenuOpen(true)} style={{ + color: theme.budgetNumberNeutral, //make sure button is visible when hovered padding: 3, }} > @@ -354,8 +355,8 @@ export const CategoryMonth = memo(function CategoryMonth({ padding: '0 4px', borderRadius: 4, ':hover': { - boxShadow: 'inset 0 0 0 1px ' + theme.mobileAccountShadow, - backgroundColor: theme.tableBackground, + boxShadow: 'inset 0 0 0 1px ' + theme.pageTextSubdued, + backgroundColor: theme.budgetCurrentMonth, }, }} valueProps={{ @@ -370,7 +371,7 @@ export const CategoryMonth = memo(function CategoryMonth({ onEdit(null); }, style: { - backgroundColor: theme.tableBackground, + backgroundColor: theme.budgetCurrentMonth, }, }} onSave={(parsedIntegerAmount: number | null) => { @@ -401,9 +402,9 @@ export const CategoryMonth = memo(function CategoryMonth({ style={{ color: scheduleStatus === 'missed' - ? theme.errorText + ? theme.budgetNumberNegative : scheduleStatus === 'due' - ? theme.warningText + ? theme.templateNumberUnderFunded : theme.upcomingText, }} onPress={() => diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx index 3ec63f543a..84ff6ae31d 100644 --- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx +++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetSummary.tsx @@ -112,7 +112,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) { width={13} height={13} // The margin is to make it the exact same size as the dots button - style={{ color: theme.pageTextSubdued, margin: 1 }} + style={{ color: theme.pageTextLight, margin: 1 }} /> @@ -238,7 +238,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) { style={{ alignSelf: 'center', alignItems: 'flex-start', - backgroundColor: theme.tableRowHeaderBackground, + backgroundColor: theme.budgetHeaderCurrentMonth, borderRadius: 4, padding: '10px 15px', marginTop: 13, @@ -255,7 +255,7 @@ export function BudgetSummary({ month }: BudgetSummaryProps) { alignItems: 'center', padding: '10px 20px', justifyContent: 'space-between', - backgroundColor: theme.tableRowHeaderBackground, + backgroundColor: theme.budgetHeaderCurrentMonth, borderTop: '1px solid ' + theme.tableBorder, }} > diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx index bffb520630..6a7612610d 100644 --- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx +++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx @@ -58,7 +58,7 @@ export function BudgetTotal< allocatedAmount: , italic: ( ), totalAmount: , diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx index 9176003556..4f1e8efa98 100644 --- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx +++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/ExpenseProgress.tsx @@ -34,8 +34,8 @@ export function ExpenseProgress({ current, target }: ExpenseProgressProps) { return ( ); diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx index 608afea503..d11d37f4ec 100644 --- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx +++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/IncomeProgress.tsx @@ -28,8 +28,8 @@ export function IncomeProgress({ current, target }: IncomeProgressProps) { return ( ); diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx index f8f8a887e2..27c32316da 100644 --- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx +++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx @@ -73,10 +73,10 @@ export function Saved({ projected, style }: SavedProps) { className={css({ fontSize: 25, color: projected - ? theme.warningText + ? theme.templateNumberUnderFunded : isNegative - ? theme.errorTextDark - : theme.upcomingText, + ? theme.budgetNumberNegative + : theme.templateNumberFunded, })} > diff --git a/upcoming-release-notes/6820.md b/upcoming-release-notes/6820.md new file mode 100644 index 0000000000..1bc82a7635 --- /dev/null +++ b/upcoming-release-notes/6820.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [Juulz] +--- + +Use consistent color variables for desktop budget pages, both envelope and tracking.