From 991fc4f45019f280e8dc3c21fd5897f8ea8de015 Mon Sep 17 00:00:00 2001 From: shall0pass <20625555+shall0pass@users.noreply.github.com> Date: Mon, 26 Feb 2024 14:21:54 -0600 Subject: [PATCH] [Theme] Midnight updates (#2394) * color updates * release note --- .../src/components/payees/PayeeTableRow.tsx | 5 ++++- packages/desktop-client/src/style/themes/midnight.ts | 12 ++++++------ upcoming-release-notes/2394.md | 6 ++++++ 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 upcoming-release-notes/2394.md diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx index 3c3f1c814..b7d2920ad 100644 --- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx +++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx @@ -129,7 +129,10 @@ export const PayeeTableRow = memo( <InputCell value={(payee.transfer_acct ? 'Transfer: ' : '') + payee.name} valueStyle={ - !selected && payee.transfer_acct && { color: theme.pageTextSubdued } + (!selected && + payee.transfer_acct && { color: theme.pageTextSubdued }) || + (!selected && !payee.transfer_acct && { color: theme.tableText }) || + (selected && { color: theme.tableTextSelected }) } exposed={focusedField === 'name'} width="flex" diff --git a/packages/desktop-client/src/style/themes/midnight.ts b/packages/desktop-client/src/style/themes/midnight.ts index 02a3b54ad..6e6dea4bd 100644 --- a/packages/desktop-client/src/style/themes/midnight.ts +++ b/packages/desktop-client/src/style/themes/midnight.ts @@ -24,17 +24,17 @@ export const tableRowBackgroundHover = colorPalette.gray500; export const tableText = colorPalette.gray150; export const tableTextLight = tableText; export const tableTextSubdued = colorPalette.gray500; -export const tableTextSelected = colorPalette.gray150; +export const tableTextSelected = colorPalette.gray800; export const tableTextHover = colorPalette.gray400; export const tableTextInactive = colorPalette.gray400; export const tableHeaderText = colorPalette.gray200; export const tableHeaderBackground = colorPalette.gray900; -export const tableBorder = colorPalette.gray500; +export const tableBorder = colorPalette.gray600; export const tableBorderSelected = colorPalette.purple400; export const tableBorderHover = colorPalette.purple300; export const tableBorderSeparator = colorPalette.gray400; export const tableRowBackgroundHighlight = colorPalette.purple150; -export const tableRowBackgroundHighlightText = colorPalette.gray600; +export const tableRowBackgroundHighlightText = colorPalette.gray800; export const tableRowHeaderBackground = colorPalette.gray700; export const tableRowHeaderText = colorPalette.gray150; @@ -63,7 +63,7 @@ export const menuAutoCompleteTextHeader = colorPalette.purple200; export const modalBackground = colorPalette.gray700; export const modalBorder = colorPalette.gray200; -export const mobileHeaderBackground = colorPalette.gray800; +export const mobileHeaderBackground = colorPalette.gray900; export const mobileHeaderText = colorPalette.purple200; export const mobileHeaderTextSubdued = colorPalette.gray200; export const mobileHeaderTextHover = 'rgba(200, 200, 200, .15)'; @@ -98,7 +98,7 @@ export const buttonMenuSelectedBorder = buttonMenuSelectedBackground; export const buttonPrimaryText = colorPalette.white; export const buttonPrimaryTextHover = buttonPrimaryText; -export const buttonPrimaryBackground = colorPalette.gray400; +export const buttonPrimaryBackground = colorPalette.purple300; export const buttonPrimaryBackgroundHover = buttonPrimaryBackground; export const buttonPrimaryBorder = buttonPrimaryBackground; export const buttonPrimaryShadow = 'rgba(0, 0, 0, 0.6)'; @@ -176,7 +176,7 @@ export const checkboxBackgroundSelected = colorPalette.purple300; export const checkboxBorderSelected = colorPalette.purple300; export const checkboxShadowSelected = colorPalette.purple500; -export const pillBackground = colorPalette.gray700; +export const pillBackground = colorPalette.gray500; export const pillBackgroundLight = colorPalette.gray900; export const pillText = colorPalette.gray200; export const pillTextHighlighted = colorPalette.purple200; diff --git a/upcoming-release-notes/2394.md b/upcoming-release-notes/2394.md new file mode 100644 index 000000000..2b60c3315 --- /dev/null +++ b/upcoming-release-notes/2394.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [shall0pass] +--- + +Midnight theme updates, round 2 -- GitLab