diff --git a/.eslintrc.js b/.eslintrc.js index b9f39901178573c800b68dafdec2ffaddd1e2d81..06c284f01a91d04da43d34d8d727f499e9b2fd2b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -228,6 +228,7 @@ module.exports = { './packages/desktop-client/src/components/SidebarWithData.*', './packages/desktop-client/src/components/Titlebar.*', './packages/desktop-client/src/components/UpdateNotification.*', + './packages/desktop-client/src/components/accounts/Header.*', './packages/desktop-client/src/components/alerts.*', './packages/desktop-client/src/components/budget/MobileBudget.*', './packages/desktop-client/src/components/budget/MobileBudgetTable.*', diff --git a/packages/desktop-client/src/components/accounts/Balance.js b/packages/desktop-client/src/components/accounts/Balance.js index 04a7a4b350bad55bc8889d7ca346fd715d829ef3..52971b66e353b680a40c2344b4b9ed1190fbbd53 100644 --- a/packages/desktop-client/src/components/accounts/Balance.js +++ b/packages/desktop-client/src/components/accounts/Balance.js @@ -171,7 +171,7 @@ export function Balances({ width: 10, height: 10, marginLeft: 10, - color: 'inherit', + color: theme.alt2PillText, transform: showExtraBalances ? 'rotateZ(180deg)' : 'rotateZ(0)', }} /> diff --git a/packages/desktop-client/src/components/accounts/Header.js b/packages/desktop-client/src/components/accounts/Header.js index e1062f7706f525d1f51dbc43b0d617c93c34555c..b9376cc07e4f083719fd97b446e999513d213b77 100644 --- a/packages/desktop-client/src/components/accounts/Header.js +++ b/packages/desktop-client/src/components/accounts/Header.js @@ -7,7 +7,7 @@ import ArrowsExpand3 from '../../icons/v2/ArrowsExpand3'; import ArrowsShrink3 from '../../icons/v2/ArrowsShrink3'; import DownloadThickBottom from '../../icons/v2/DownloadThickBottom'; import Pencil1 from '../../icons/v2/Pencil1'; -import { styles } from '../../style'; +import { colors, styles } from '../../style'; import AnimatedRefresh from '../AnimatedRefresh'; import Button from '../common/Button'; import InitialFocus from '../common/InitialFocus'; @@ -170,7 +170,7 @@ export function AccountHeader({ style={{ width: 11, height: 11, - color: 'inherit', + color: colors.n8, }} /> </Button> diff --git a/packages/desktop-client/src/components/schedules/StatusBadge.js b/packages/desktop-client/src/components/schedules/StatusBadge.js index 5b9d67cd4c598a57cdacc586e4b9e21b208203db..c59447ddbdc153084dd892e32b07709b741b3155 100644 --- a/packages/desktop-client/src/components/schedules/StatusBadge.js +++ b/packages/desktop-client/src/components/schedules/StatusBadge.js @@ -58,7 +58,7 @@ export function getStatusProps(status) { Icon = CheckCircle1; break; default: - color = colors.n1; + color = colors.n7; backgroundColor = colors.n11; Icon = CheckCircleHollow; break; diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.js b/packages/desktop-client/src/components/transactions/TransactionsTable.js index db1051708c84f07e403efbe244436d8ed583f813..10214e326ca323078121dd5d5edfa44e934a19f0 100644 --- a/packages/desktop-client/src/components/transactions/TransactionsTable.js +++ b/packages/desktop-client/src/components/transactions/TransactionsTable.js @@ -1108,7 +1108,11 @@ const Transaction = memo(function Transaction(props) { : '' } valueStyle={valueStyle} - style={{ fontStyle: 'italic', fontWeight: 300 }} + style={{ + fontStyle: 'italic', + color: '#c0c0c0', + fontWeight: 300, + }} inputProps={{ readOnly: true, style: { fontStyle: 'italic' }, diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.ts index 860f97b7d2bd916f2f41440ba58d61bff90fe5b8..2c635c4442b32225db850c3938baff81ec18b281 100644 --- a/packages/desktop-client/src/style/themes/light.ts +++ b/packages/desktop-client/src/style/themes/light.ts @@ -23,7 +23,7 @@ export const cardShadow = colorPalette.navy700; export const tableBackground = colorPalette.white; export const tableRowBackgroundHover = colorPalette.navy50; -export const tableText = colorPalette.navy700; +export const tableText = pageText; export const altTableText = colorPalette.navy400; export const tableTextSelected = colorPalette.navy700; export const tableTextHover = colorPalette.navy900; @@ -129,7 +129,7 @@ export const buttonBareDisabledText = buttonNormalDisabledText; export const buttonBareDisabledBackground = buttonBareBackground; export const noticeBackground = colorPalette.green50; -export const noticeText = colorPalette.green600; +export const noticeText = colorPalette.green500; export const noticeAccent = colorPalette.green200; export const warningBackground = colorPalette.orange200; export const warningText = colorPalette.orange800; diff --git a/upcoming-release-notes/1530.md b/upcoming-release-notes/1530.md new file mode 100644 index 0000000000000000000000000000000000000000..1f0955b597b8616ee2cb0468022e06ac7ccf63d8 --- /dev/null +++ b/upcoming-release-notes/1530.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [MatissJanis] +--- + +Fix lightmode regressions introduced with experimental darkmode changes.