Skip to content

Commit

Permalink
Darkmode: fix theming on budget table (#1795)
Browse files Browse the repository at this point in the history
* fix darkmode for budget table

* note

* lint

* fix totals line, fix group colot
  • Loading branch information
youngcw authored Oct 16, 2023
1 parent 38609ee commit b45615e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const BudgetCategories = memo(
<View
style={{
marginBottom: 10,
backgroundColor: 'white',
backgroundColor: theme.tableBackground,
overflow: 'hidden',
boxShadow: styles.cardShadow,
borderRadius: '0 0 4px 4px',
Expand Down Expand Up @@ -235,7 +235,7 @@ const BudgetCategories = memo(
<View
style={{
height: styles.incomeHeaderHeight,
backgroundColor: 'white',
backgroundColor: theme.tableBackground,
}}
>
<IncomeHeader
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop-client/src/components/budget/BudgetTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { createRef, Component } from 'react';

import * as monthUtils from 'loot-core/src/shared/months';

import { styles } from '../../style';
import { theme, styles } from '../../style';
import View from '../common/View';
import { IntersectionBoundary } from '../tooltips';

Expand Down Expand Up @@ -189,7 +189,7 @@ class BudgetTable extends Component {
backgroundColor: 'transparent',
},
'& ::-webkit-scrollbar-thumb:vertical': {
backgroundColor: 'white',
backgroundColor: theme.tableHeaderBackground,
},
}),
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const BudgetTotals = memo(function BudgetTotals({
<View
data-testid="budget-totals"
style={{
backgroundColor: 'white',
backgroundColor: theme.tableBackground,
flexDirection: 'row',
flexShrink: 0,
boxShadow: styles.cardShadow,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';

import { theme } from '../../style';
import View from '../common/View';
import { useDraggable, useDroppable, DropHighlight } from '../sort';
import { Row } from '../table';
Expand Down Expand Up @@ -46,7 +47,7 @@ function ExpenseCategory({
innerRef={dropRef}
collapsed={true}
style={{
backgroundColor: 'transparent',
backgroundColor: theme.tableBackground,
opacity: cat.hidden ? 0.5 : undefined,
}}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-client/src/style/themes/dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const cardBorder = colorPalette.purple400;
export const cardShadow = colorPalette.navy700;

export const tableBackground = colorPalette.navy800;
export const altTableBackground = tableBackground;
export const altTableBackground = colorPalette.navy700;
export const alt2TableBackground = tableBackground;
export const tableRowBackgroundHover = colorPalette.navy700;
export const tableText = colorPalette.navy150;
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/1795.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Enhancements
authors: [youngcw]
---

Dark Theme: add theming to budget table where it was missing

0 comments on commit b45615e

Please sign in to comment.