From efec507bf8ef3c8e08c36bcc1ac0dfeb082e4a03 Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Wed, 16 Aug 2023 17:45:21 +0100
Subject: [PATCH] :bug: (darkmode) fixing lightmode regressions in transaction
table (#1530)
---
.eslintrc.js | 1 +
packages/desktop-client/src/components/accounts/Balance.js | 2 +-
packages/desktop-client/src/components/accounts/Header.js | 4 ++--
.../desktop-client/src/components/schedules/StatusBadge.js | 2 +-
.../src/components/transactions/TransactionsTable.js | 6 +++++-
packages/desktop-client/src/style/themes/light.ts | 4 ++--
upcoming-release-notes/1530.md | 6 ++++++
7 files changed, 18 insertions(+), 7 deletions(-)
create mode 100644 upcoming-release-notes/1530.md
diff --git a/.eslintrc.js b/.eslintrc.js
index b9f399011..06c284f01 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 04a7a4b35..52971b66e 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 e1062f770..b9376cc07 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 5b9d67cd4..c59447ddb 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 db1051708..10214e326 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 860f97b7d..2c635c444 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 000000000..1f0955b59
--- /dev/null
+++ b/upcoming-release-notes/1530.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Fix lightmode regressions introduced with experimental darkmode changes.
--
GitLab