A local-first personal finance app
Color Consolidations (#1868)
Neilfecc9178b30f
diff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.pngindex f04a3330cc..2e137dac15 100644Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.pngindex 767f0f0688..fe741331d4 100644Binary files a/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-1-chromium-linux.pngindex 6ca4a16dd3..83c7dd47bb 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-checks-that-settings-page-can-be-opened-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.pngindex fc388832ed..a9550879a2 100644Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.pngindex 1366ec299a..729aef5dd8 100644Binary files a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.pngindex 514fef5fcd..6fccc8eeda 100644Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsxindex 7d25feb94c..76d4c9a9ac 100644--- a/packages/desktop-client/src/components/NotesButton.tsx+++ b/packages/desktop-client/src/components/NotesButton.tsx@@ -115,6 +115,8 @@ function NotesTooltip({minWidth: 350,minHeight: 120,outline: 'none',+ backgroundColor: theme.tableBackground,+ color: theme.tableText,})}`}value={notes || ''}onChange={e => setNotes(e.target.value)}diff --git a/packages/desktop-client/src/components/accounts/Balance.js b/packages/desktop-client/src/components/accounts/Balance.jsindex 84b4c9a9ce..c3710c2c9a 100644--- a/packages/desktop-client/src/components/accounts/Balance.js+++ b/packages/desktop-client/src/components/accounts/Balance.js@@ -24,7 +24,7 @@ function DetailedBalance({ name, balance, isExactBalance = true }) {marginLeft: 15,borderRadius: 4,padding: '4px 6px',- color: theme.alt2PillText,+ color: theme.pillText,backgroundColor: theme.pillBackground,}}>@@ -172,7 +172,7 @@ export function Balances({width: 10,height: 10,marginLeft: 10,- color: theme.alt2PillText,+ color: theme.pillText,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.jsindex e6dcfe5494..1e7dcbbe85 100644--- a/packages/desktop-client/src/components/accounts/Header.js+++ b/packages/desktop-client/src/components/accounts/Header.js@@ -160,7 +160,12 @@ export function AccountHeader({: accountName}</View>- {account && <NotesButton id={`account-${account.id}`} />}+ {account && (+ <NotesButton+ id={`account-${account.id}`}+ defaultColor={theme.pageTextSubdued}+ />+ )}<Buttontype="bare"className="hover-visible"@@ -170,7 +175,7 @@ export function AccountHeader({style={{width: 11,height: 11,- color: theme.altButtonBareText,+ color: theme.pageTextSubdued,}}/></Button>diff --git a/packages/desktop-client/src/components/alerts.tsx b/packages/desktop-client/src/components/alerts.tsxindex 464922f28a..fe1cdb7795 100644--- a/packages/desktop-client/src/components/alerts.tsx+++ b/packages/desktop-client/src/components/alerts.tsx@@ -33,7 +33,7 @@ const Alert = ({padding: 10,flexDirection: 'row','& a, & a:active, & a:visited': {- color: theme.altFormLabelText,+ color: theme.formLabelText,},...style,}}diff --git a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx b/packages/desktop-client/src/components/budget/MonthCountSelector.tsxindex 25137630cc..8a325e18f2 100644--- a/packages/desktop-client/src/components/budget/MonthCountSelector.tsx+++ b/packages/desktop-client/src/components/budget/MonthCountSelector.tsx@@ -42,7 +42,7 @@ export function MonthCountSelector({calendars.push(<Calendarkey={i}- color={maxMonths >= i ? theme.pageTextLight : theme.altButtonBareText}+ color={maxMonths >= i ? theme.pageTextLight : theme.pageTextSubdued}onClick={() => onChange(i)}/>,);diff --git a/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsxindex 36b6b3b4b7..b6b0a4142e 100644--- a/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx+++ b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.tsx@@ -375,7 +375,7 @@ export function BudgetSummary({<DotsHorizontalTriplewidth={15}height={15}- style={{ color: theme.alt2PillText }}+ style={{ color: theme.pageTextLight }}/></Button>{menuOpen && (diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.js b/packages/desktop-client/src/components/filters/FiltersMenu.jsindex 6250230296..7e51e9cd89 100644--- a/packages/desktop-client/src/components/filters/FiltersMenu.js+++ b/packages/desktop-client/src/components/filters/FiltersMenu.js@@ -96,7 +96,7 @@ function OpButton({ op, selected, style, onClick }) {<Buttontype="bare"style={{- backgroundColor: theme.altbuttonMenuBackground,+ backgroundColor: theme.pillBackground,marginBottom: 5,...style,...(selected && {diff --git a/packages/desktop-client/src/components/forms.tsx b/packages/desktop-client/src/components/forms.tsxindex 516668b33e..017232e115 100644--- a/packages/desktop-client/src/components/forms.tsx+++ b/packages/desktop-client/src/components/forms.tsx@@ -18,7 +18,7 @@ export const SectionLabel = ({ title, style }: SectionLabelProps) => {style={{fontWeight: 500,textTransform: 'uppercase',- color: theme.altFormLabelText,+ color: theme.formLabelText,marginBottom: 5,lineHeight: '1em',...style,@@ -89,15 +89,15 @@ export const Checkbox = (props: CheckboxProps) => {display: 'flex',alignItems: 'center',justifyContent: 'center',- color: theme.tableBackground,+ color: theme.checkboxText,backgroundColor: theme.tableBackground,':checked': {- border: '1px solid ' + theme.altFormInputBorderSelected,- backgroundColor: theme.tableTextEditingBackground,+ border: '1px solid ' + theme.checkboxBorderSelected,+ backgroundColor: theme.checkboxBackgroundSelected,'::after': {display: 'block',background:- theme.tableTextEditingBackground ++ theme.checkboxBackgroundSelected +// eslint-disable-next-line rulesdir/typography' url(\'data:image/svg+xml; utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill="white" d="M0 11l2-2 5 5L18 3l2 2L7 18z"/></svg>\') 9px 9px',width: 9,@@ -112,7 +112,7 @@ export const Checkbox = (props: CheckboxProps) => {bottom: -5,left: -5,right: -5,- border: '2px solid ' + theme.altFormInputBorderSelected,+ border: '2px solid ' + theme.checkboxBorderSelected,borderRadius: 6,content: ' ',},diff --git a/packages/desktop-client/src/components/manager/Import.js b/packages/desktop-client/src/components/manager/Import.jsindex a57ce920a4..630e7e3074 100644--- a/packages/desktop-client/src/components/manager/Import.js+++ b/packages/desktop-client/src/components/manager/Import.js@@ -59,19 +59,19 @@ function Import({ modalProps, actions }) {<Button style={itemStyle} onClick={() => onSelectType('ynab4')}><span style={{ fontWeight: 700 }}>YNAB4</span>- <View style={{ color: theme.alt2PillText }}>+ <View style={{ color: theme.pageTextLight }}>The old unsupported desktop app</View></Button><Button style={itemStyle} onClick={() => onSelectType('ynab5')}><span style={{ fontWeight: 700 }}>nYNAB</span>- <View style={{ color: theme.alt2PillText }}>+ <View style={{ color: theme.pageTextLight }}><div>The newer web app</div></View></Button><Button style={itemStyle} onClick={() => onSelectType('actual')}><span style={{ fontWeight: 700 }}>Actual</span>- <View style={{ color: theme.alt2PillText }}>+ <View style={{ color: theme.pageTextLight }}><div>Import a file exported from Actual</div></View></Button>diff --git a/packages/desktop-client/src/components/modals/EditField.js b/packages/desktop-client/src/components/modals/EditField.jsindex 7cf9900041..e6f68be049 100644--- a/packages/desktop-client/src/components/modals/EditField.js+++ b/packages/desktop-client/src/components/modals/EditField.js@@ -205,7 +205,7 @@ export default function EditField({ modalProps, name, onSubmit }) {title={label}style={{alignSelf: 'center',- color: theme.altMobileModalText,+ color: theme.mobileModalText,marginBottom: 10,}}/>diff --git a/packages/desktop-client/src/components/modals/EditRule.js b/packages/desktop-client/src/components/modals/EditRule.jsindex 296ece82af..b5d633c6c9 100644--- a/packages/desktop-client/src/components/modals/EditRule.js+++ b/packages/desktop-client/src/components/modals/EditRule.js@@ -755,8 +755,8 @@ export default function EditRule({}let editorStyle = {- color: theme.altPillText,- backgroundColor: theme.altPillBackground,+ color: theme.pillText,+ backgroundColor: theme.pillBackground,borderRadius: 4,};diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.js b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.jsindex 8e610a3c31..4fdc01497e 100644--- a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.js+++ b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.js@@ -154,7 +154,7 @@ export default function GoCardlessExternalMsg({be misconfigured. Please{' '}<LinkButtononClick={onGoCardlessInit}- style={{ color: theme.altFormLabelText, display: 'inline' }}+ style={{ color: theme.formLabelText, display: 'inline' }}>set them up</LinkButton>{' '}diff --git a/packages/desktop-client/src/components/rules/ActionExpression.tsx b/packages/desktop-client/src/components/rules/ActionExpression.tsxindex a320c79d93..4f8536502c 100644--- a/packages/desktop-client/src/components/rules/ActionExpression.tsx+++ b/packages/desktop-client/src/components/rules/ActionExpression.tsx@@ -31,8 +31,8 @@ export default function ActionExpression({style={{display: 'block',maxWidth: '100%',- color: theme.altPillText,- backgroundColor: theme.altPillBackground,+ color: theme.pillText,+ backgroundColor: theme.pillBackground,borderRadius: 4,padding: '3px 5px',whiteSpace: 'nowrap',diff --git a/packages/desktop-client/src/components/rules/ConditionExpression.tsx b/packages/desktop-client/src/components/rules/ConditionExpression.tsxindex c1fa94c5e2..35b4e2bbb4 100644--- a/packages/desktop-client/src/components/rules/ConditionExpression.tsx+++ b/packages/desktop-client/src/components/rules/ConditionExpression.tsx@@ -36,8 +36,8 @@ export default function ConditionExpression({style={{display: 'block',maxWidth: '100%',- color: theme.altPillText,- backgroundColor: theme.altPillBackground,+ color: theme.pillText,+ backgroundColor: theme.pillBackground,borderRadius: 4,padding: '3px 5px',whiteSpace: 'nowrap',diff --git a/packages/desktop-client/src/components/select/DateSelect.tsx b/packages/desktop-client/src/components/select/DateSelect.tsxindex e3ab976d50..e08d8e60bb 100644--- a/packages/desktop-client/src/components/select/DateSelect.tsx+++ b/packages/desktop-client/src/components/select/DateSelect.tsx@@ -35,8 +35,8 @@ import DateSelectRight from './DateSelect.right.png';let pickerStyles = {'& .pika-single.actual-date-picker': {- color: theme.sidebarItemTextHover,- background: theme.sidebarBackground,+ color: theme.calendarText,+ background: theme.calendarBackground,border: 'none',boxShadow: '0 0px 4px rgba(0, 0, 0, .25)',borderRadius: 4,@@ -49,7 +49,7 @@ let pickerStyles = {},// month/year'& .pika-label': {- backgroundColor: theme.sidebarBackground,+ backgroundColor: theme.calendarBackground,},// Back/forward buttons'& .pika-prev': {@@ -60,19 +60,19 @@ let pickerStyles = {},// Day of week'& .pika-table th': {- color: theme.sidebarItemText,+ color: theme.calendarItemText,'& abbr': { textDecoration: 'none' },},// Numbered days'& .pika-button': {- backgroundColor: theme.sidebarItemBackgroundHover,- color: theme.sidebarItemText,+ backgroundColor: theme.calendarItemBackground,+ color: theme.calendarItemText,},'& .is-today .pika-button': {textDecoration: 'underline',},'& .is-selected .pika-button': {- backgroundColor: theme.altButtonNormalSelectedBackground,+ backgroundColor: theme.calendarSelectedBackground,boxShadow: 'none',},},diff --git a/packages/desktop-client/src/components/settings/UI.tsx b/packages/desktop-client/src/components/settings/UI.tsxindex 0e96292cb8..e366608383 100644--- a/packages/desktop-client/src/components/settings/UI.tsx+++ b/packages/desktop-client/src/components/settings/UI.tsx@@ -24,7 +24,7 @@ export const Setting = ({ primaryAction, style, children }: SettingProps) => {alignItems: 'flex-start',padding: 15,borderRadius: 4,- border: '1px solid ' + theme.altPillBorder,+ border: '1px solid ' + theme.pillBorderDark,width: '100%',},style,diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsxindex 5962eaba50..4869694aae 100644--- a/packages/desktop-client/src/components/table.tsx+++ b/packages/desktop-client/src/components/table.tsx@@ -634,15 +634,15 @@ export function SelectCell({alignItems: 'center',borderRadius: 3,border: selected- ? '1px solid ' + theme.altFormInputBorderSelected+ ? '1px solid ' + theme.checkboxBorderSelected: '1px solid ' + theme.formInputBorder,- color: theme.tableBackground,+ color: theme.checkboxText,backgroundColor: selected- ? theme.tableTextEditingBackground+ ? theme.checkboxBackgroundSelected: theme.tableBackground,':focus': {- border: '1px solid ' + theme.altFormInputBorderSelected,- boxShadow: '0 1px 2px ' + theme.altFormInputShadowSelected,+ border: '1px solid ' + theme.checkboxBorderSelected,+ boxShadow: '0 1px 2px ' + theme.checkboxShadowSelected,},}}onEdit={onEdit}diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.jsindex 515d5c1ad0..4c54a5c0e7 100644--- a/packages/desktop-client/src/components/transactions/MobileTransaction.js+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js@@ -628,12 +628,12 @@ class TransactionEditInner extends PureComponent {<SvgAddwidth={17}height={17}- style={{ color: theme.altFormLabelText }}+ style={{ color: theme.formLabelText }}/><Textstyle={{...styles.text,- color: theme.altFormLabelText,+ color: theme.formLabelText,marginLeft: 5,}}>@@ -990,7 +990,7 @@ class Transaction extends PureComponent {height: 11,color: cleared? theme.noticeTextLight- : theme.altButtonBareText,+ : theme.pageTextSubdued,marginRight: 5,}}/>diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.tsindex 68e475657a..289a9ef7dc 100644--- a/packages/desktop-client/src/style/themes/dark.ts+++ b/packages/desktop-client/src/style/themes/dark.ts@@ -26,8 +26,6 @@ export const tableTextLight = tableText;export const tableTextSubdued = colorPalette.navy150;export const tableTextSelected = colorPalette.navy150;export const tableTextHover = colorPalette.navy400;-export const tableTextEditing = colorPalette.black;-export const tableTextEditingBackground = colorPalette.purple400;export const tableTextInactive = colorPalette.navy500;export const tableHeaderText = colorPalette.navy300;export const tableHeaderBackground = colorPalette.navy700;@@ -77,7 +75,6 @@ export const mobileAccountShadow = cardShadow;export const mobileAccountText = colorPalette.blue800;export const mobileModalBackground = colorPalette.navy900;export const mobileModalText = colorPalette.white;-export const altMobileModalText = colorPalette.blue100;export const mobileDateBackground = colorPalette.navy100;// Mobile view themes (for the top bar)@@ -88,6 +85,10 @@ export const mobileConfigServerViewTheme = colorPalette.purple500;export const mobileSettingsViewTheme = colorPalette.navy50;export const mobileTransactionViewTheme = colorPalette.purple500;+export const markdownNormal = colorPalette.purple700;+export const markdownDark = colorPalette.purple500;+export const markdownLight = colorPalette.purple800;+// Buttonexport const buttonMenuText = colorPalette.navy900;export const buttonMenuTextHover = buttonMenuText;@@ -116,18 +117,19 @@ export const buttonNormalBackground = colorPalette.navy800;export const buttonNormalBackgroundHover = colorPalette.navy600;export const buttonNormalBorder = colorPalette.navy300;export const buttonNormalShadow = 'rgba(0, 0, 0, 0.4)';--export const altbuttonMenuBackground = buttonNormalBackground;export const buttonNormalSelectedText = colorPalette.white;export const buttonNormalSelectedBackground = colorPalette.purple600;-export const altButtonNormalSelectedBackground = buttonNormalSelectedBackground;-export const buttonNormalDisabledText = colorPalette.navy500;export const buttonNormalDisabledBackground = colorPalette.navy800;export const buttonNormalDisabledBorder = colorPalette.navy500;+export const calendarText = colorPalette.navy50;+export const calendarBackground = colorPalette.navy900;+export const calendarItemText = colorPalette.navy150;+export const calendarItemBackground = colorPalette.navy800;+export const calendarSelectedBackground = buttonNormalSelectedBackground;+export const buttonBareText = buttonNormalText;-export const altButtonBareText = buttonBareText;export const buttonBareTextHover = buttonNormalText;export const buttonBareBackground = 'transparent';export const buttonBareBackgroundHover = 'rgba(200, 200, 200, .3)';@@ -159,7 +161,6 @@ export const upcomingText = colorPalette.purple100;export const upcomingBorder = tableBorder;export const formLabelText = colorPalette.purple150;-export const altFormLabelText = formLabelText;export const formLabelBackground = colorPalette.blue900;export const formInputBackground = colorPalette.navy800;export const formInputBackgroundSelected = colorPalette.navy700;@@ -167,27 +168,26 @@ export const formInputBackgroundSelection = colorPalette.purple400;export const formInputBorder = colorPalette.navy600;export const formInputTextReadOnlySelection = colorPalette.navy800;export const formInputBorderSelected = colorPalette.purple400;-export const altFormInputBorderSelected = formInputBorderSelected;export const formInputText = colorPalette.navy150;export const formInputTextSelected = colorPalette.black;export const formInputTextPlaceholder = colorPalette.navy150;export const formInputTextPlaceholderSelected = colorPalette.navy100;export const formInputTextSelection = colorPalette.navy800;export const formInputShadowSelected = colorPalette.purple200;-export const altFormInputShadowSelected = formInputShadowSelected;export const formInputTextHighlight = colorPalette.purple400;+export const checkboxText = tableText;+export const checkboxBackgroundSelected = colorPalette.purple300;+export const checkboxBorderSelected = colorPalette.purple300;+export const checkboxShadowSelected = colorPalette.purple500;export const pillBackground = colorPalette.navy800;export const pillText = colorPalette.navy200;export const pillTextHighlighted = colorPalette.purple500;export const pillBorder = colorPalette.navy700;-export const altPillBorder = pillBorder;+export const pillBorderDark = pillBorder;export const pillBackgroundSelected = colorPalette.purple600;export const pillTextSelected = colorPalette.navy150;export const pillBorderSelected = colorPalette.purple400;-export const altPillBackground = pillBackground;-export const altPillText = pillText;-export const alt2PillText = pillText;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;diff --git a/packages/desktop-client/src/style/themes/development.ts b/packages/desktop-client/src/style/themes/development.tsindex 463f7abf06..e0895e7a7c 100644--- a/packages/desktop-client/src/style/themes/development.ts+++ b/packages/desktop-client/src/style/themes/development.ts@@ -15,9 +15,9 @@ export const pageTextPositive = colorPalette.purple600;export const pageTextLink = colorPalette.blue600;export const pageTextLinkLight = colorPalette.blue300;-export const cardBackground = colorPalette.purple700;-export const cardBorder = colorPalette.purple400;-export const cardShadow = colorPalette.purple100;+export const cardBackground = colorPalette.white;+export const cardBorder = colorPalette.purple700;+export const cardShadow = colorPalette.navy700;export const tableBackground = colorPalette.white;export const tableRowBackgroundHover = colorPalette.navy50;@@ -26,8 +26,6 @@ export const tableTextLight = colorPalette.navy400;export const tableTextSubdued = colorPalette.navy100;export const tableTextSelected = colorPalette.navy700;export const tableTextHover = colorPalette.navy900;-export const tableTextEditing = colorPalette.navy50;-export const tableTextEditingBackground = colorPalette.blue500;export const tableTextInactive = colorPalette.navy500;export const tableHeaderText = colorPalette.navy600;export const tableHeaderBackground = colorPalette.white;@@ -68,8 +66,8 @@ export const menuAutoCompleteBackgroundHover = colorPalette.navy600;export const menuAutoCompleteText = colorPalette.white;export const menuAutoCompleteTextHeader = colorPalette.orange150;-export const modalBackground = colorPalette.navy900;-export const modalBorder = colorPalette.navy200;+export const modalBackground = colorPalette.white;+export const modalBorder = colorPalette.white;export const mobileNavBackground = colorPalette.white;export const mobileNavItem = colorPalette.gray300;export const mobileNavItemSelected = colorPalette.purple500;@@ -77,16 +75,27 @@ export const mobileAccountShadow = colorPalette.navy300;export const mobileAccountText = colorPalette.blue800;export const mobileModalBackground = colorPalette.navy900;export const mobileModalText = colorPalette.white;-export const altMobileModalText = colorPalette.blue100;export const mobileDateBackground = colorPalette.navy100;+// Mobile view themes (for the top bar)+export const mobileAccountViewTheme = colorPalette.navy50;+export const mobileAccountsViewTheme = colorPalette.blue800;+export const mobileBudgetViewTheme = colorPalette.purple500;+export const mobileConfigServerViewTheme = colorPalette.purple500;+export const mobileSettingsViewTheme = colorPalette.navy50;+export const mobileTransactionViewTheme = colorPalette.purple500;++export const markdownNormal = colorPalette.purple150;+export const markdownDark = colorPalette.purple400;+export const markdownLight = colorPalette.purple100;+// Button-export const buttonMenuText = colorPalette.navy150;-export const buttonMenuTextHover = colorPalette.navy100;-export const buttonMenuBackground = colorPalette.navy800;-export const buttonMenuBackgroundHover = colorPalette.navy600;-export const buttonMenuBorder = colorPalette.navy600;-export const buttonMenuSelectedText = colorPalette.navy100;+export const buttonMenuText = colorPalette.navy100;+export const buttonMenuTextHover = colorPalette.navy50;+export const buttonMenuBackground = 'transparent';+export const buttonMenuBackgroundHover = 'rgba(200, 200, 200, .25)';+export const buttonMenuBorder = colorPalette.navy500;+export const buttonMenuSelectedText = colorPalette.green800;export const buttonMenuSelectedTextHover = colorPalette.orange800;export const buttonMenuSelectedBackground = colorPalette.orange200;export const buttonMenuSelectedBackgroundHover = colorPalette.orange300;@@ -102,43 +111,44 @@ export const buttonPrimaryDisabledText = colorPalette.white;export const buttonPrimaryDisabledBackground = colorPalette.navy300;export const buttonPrimaryDisabledBorder = buttonPrimaryDisabledBackground;-export const buttonNormalText = colorPalette.navy50;-export const buttonNormalTextHover = colorPalette.navy200;-export const buttonNormalBackground = colorPalette.navy400;-export const buttonNormalBackgroundHover = colorPalette.navy500;-export const buttonNormalBorder = colorPalette.navy800;-export const buttonNormalShadow = colorPalette.navy700;--export const altbuttonMenuBackground = colorPalette.navy100;-export const buttonNormalSelectedText = colorPalette.purple200;-export const buttonNormalSelectedBackground = colorPalette.purple400;-export const altButtonNormalSelectedBackground = buttonNormalSelectedBackground;--export const buttonNormalDisabledText = colorPalette.navy500;-export const buttonNormalDisabledBackground = colorPalette.navy800;-export const buttonNormalDisabledBorder = colorPalette.navy500;--export const buttonBareText = colorPalette.navy50;-export const altButtonBareText = buttonBareText;-export const buttonBareTextHover = colorPalette.navy200;-export const buttonBareBackground = colorPalette.navy400;-export const buttonBareBackgroundHover = colorPalette.purple800;+export const buttonNormalText = colorPalette.navy900;+export const buttonNormalTextHover = buttonNormalText;+export const buttonNormalBackground = colorPalette.white;+export const buttonNormalBackgroundHover = buttonNormalBackground;+export const buttonNormalBorder = colorPalette.navy150;+export const buttonNormalShadow = 'rgba(0, 0, 0, 0.2)';+export const buttonNormalSelectedText = colorPalette.white;+export const buttonNormalSelectedBackground = colorPalette.blue600;+export const buttonNormalDisabledText = colorPalette.navy300;+export const buttonNormalDisabledBackground = buttonNormalBackground;+export const buttonNormalDisabledBorder = buttonNormalBorder;++export const calendarText = colorPalette.navy50;+export const calendarBackground = colorPalette.navy900;+export const calendarItemText = colorPalette.navy150;+export const calendarItemBackground = colorPalette.navy800;+export const calendarSelectedBackground = colorPalette.navy500;++export const buttonBareText = buttonNormalText;+export const buttonBareTextHover = buttonNormalText;+export const buttonBareBackground = 'transparent';+export const buttonBareBackgroundHover = 'rgba(100, 100, 100, .15)';export const buttonBareBackgroundActive = 'rgba(100, 100, 100, .25)';export const buttonBareDisabledText = buttonNormalDisabledText;export const buttonBareDisabledBackground = buttonBareBackground;-export const noticeBackground = colorPalette.green800;-export const noticeBackgroundLight = noticeBackground;-export const noticeBackgroundDark = noticeBackground;-export const noticeText = colorPalette.green300;-export const noticeTextLight = noticeText;-export const noticeTextDark = noticeText;-export const noticeTextMenu = colorPalette.green500;+export const noticeBackground = colorPalette.green150;+export const noticeBackgroundLight = colorPalette.green100;+export const noticeBackgroundDark = colorPalette.green500;+export const noticeText = colorPalette.green700;+export const noticeTextLight = colorPalette.green500;+export const noticeTextDark = colorPalette.green900;+export const noticeTextMenu = colorPalette.green200;export const noticeBorder = colorPalette.green500;-export const warningBackground = colorPalette.orange800;-export const warningText = colorPalette.orange200;-export const warningTextLight = warningText;-export const warningTextDark = warningText;+export const warningBackground = colorPalette.orange200;+export const warningText = colorPalette.orange700;+export const warningTextLight = colorPalette.orange500;+export const warningTextDark = colorPalette.orange900;export const warningBorder = colorPalette.orange500;export const errorBackground = colorPalette.red100;export const errorText = colorPalette.red500;@@ -150,36 +160,34 @@ export const upcomingBackground = colorPalette.purple100;export const upcomingText = colorPalette.purple700;export const upcomingBorder = colorPalette.purple500;-export const formLabelText = colorPalette.purple200;-export const altFormLabelText = formLabelText;+export const formLabelText = colorPalette.blue600;export const formLabelBackground = colorPalette.blue200;-export const formInputBackground = colorPalette.purple700;-export const formInputBackgroundSelected = colorPalette.purple400;-export const formInputBackgroundSelection = colorPalette.purple400;-export const formInputBorder = colorPalette.purple600;-export const formInputTextReadOnlySelection = colorPalette.purple800;-export const formInputBorderSelected = colorPalette.purple100;-export const altFormInputBorderSelected = formInputBorderSelected;-export const formInputText = colorPalette.purple150;-export const formInputTextSelected = colorPalette.purple800;-export const formInputTextPlaceholder = colorPalette.navy150;-export const formInputTextPlaceholderSelected = formInputTextPlaceholder;-export const formInputTextSelection = colorPalette.navy800;-export const formInputShadowSelected = colorPalette.purple400;-export const altFormInputShadowSelected = formInputShadowSelected;-export const formInputTextHighlight = colorPalette.purple400;--export const pillBackground = colorPalette.green800;-export const pillText = colorPalette.green600;+export const formInputBackground = colorPalette.navy50;+export const formInputBackgroundSelected = colorPalette.white;+export const formInputBackgroundSelection = colorPalette.purple500;+export const formInputBorder = colorPalette.navy150;+export const formInputTextReadOnlySelection = colorPalette.navy50;+export const formInputBorderSelected = colorPalette.purple500;+export const formInputText = colorPalette.navy900;+export const formInputTextSelected = colorPalette.navy50;+export const formInputTextPlaceholder = colorPalette.navy300;+export const formInputTextPlaceholderSelected = colorPalette.navy200;+export const formInputTextSelection = colorPalette.navy100;+export const formInputShadowSelected = colorPalette.purple300;+export const formInputTextHighlight = colorPalette.purple200;+export const checkboxText = tableBackground;+export const checkboxBackgroundSelected = colorPalette.blue500;+export const checkboxBorderSelected = colorPalette.blue500;+export const checkboxShadowSelected = colorPalette.blue300;++export const pillBackground = colorPalette.navy150;+export const pillText = colorPalette.navy800;export const pillTextHighlighted = colorPalette.purple600;-export const pillBorder = colorPalette.green200;-export const altPillBorder = pillBorder;-export const pillBackgroundSelected = colorPalette.green100;-export const pillTextSelected = colorPalette.green700;-export const pillBorderSelected = colorPalette.green900;-export const altPillBackground = pillBackground;-export const altPillText = pillText;-export const alt2PillText = pillText;+export const pillBorder = colorPalette.navy150;+export const pillBorderDark = pillBorder;+export const pillBackgroundSelected = colorPalette.blue150;+export const pillTextSelected = colorPalette.blue900;+export const pillBorderSelected = colorPalette.purple500;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.tsindex e4392062e6..61881ee729 100644--- a/packages/desktop-client/src/style/themes/light.ts+++ b/packages/desktop-client/src/style/themes/light.ts@@ -26,8 +26,6 @@ export const tableTextLight = colorPalette.navy400;export const tableTextSubdued = colorPalette.navy100;export const tableTextSelected = colorPalette.navy700;export const tableTextHover = colorPalette.navy900;-export const tableTextEditing = colorPalette.navy50;-export const tableTextEditingBackground = colorPalette.blue500;export const tableTextInactive = colorPalette.navy500;export const tableHeaderText = colorPalette.navy600;export const tableHeaderBackground = colorPalette.white;@@ -77,7 +75,6 @@ export const mobileAccountShadow = colorPalette.navy300;export const mobileAccountText = colorPalette.blue800;export const mobileModalBackground = colorPalette.navy900;export const mobileModalText = colorPalette.white;-export const altMobileModalText = colorPalette.blue100;export const mobileDateBackground = colorPalette.navy100;// Mobile view themes (for the top bar)@@ -120,18 +117,19 @@ export const buttonNormalBackground = colorPalette.white;export const buttonNormalBackgroundHover = buttonNormalBackground;export const buttonNormalBorder = colorPalette.navy150;export const buttonNormalShadow = 'rgba(0, 0, 0, 0.2)';--export const altbuttonMenuBackground = colorPalette.navy100;export const buttonNormalSelectedText = colorPalette.white;export const buttonNormalSelectedBackground = colorPalette.blue600;-export const altButtonNormalSelectedBackground = colorPalette.navy500;-export const buttonNormalDisabledText = colorPalette.navy300;export const buttonNormalDisabledBackground = buttonNormalBackground;export const buttonNormalDisabledBorder = buttonNormalBorder;+export const calendarText = colorPalette.navy50;+export const calendarBackground = colorPalette.navy900;+export const calendarItemText = colorPalette.navy150;+export const calendarItemBackground = colorPalette.navy800;+export const calendarSelectedBackground = colorPalette.navy500;+export const buttonBareText = buttonNormalText;-export const altButtonBareText = colorPalette.navy200;export const buttonBareTextHover = buttonNormalText;export const buttonBareBackground = 'transparent';export const buttonBareBackgroundHover = 'rgba(100, 100, 100, .15)';@@ -162,8 +160,7 @@ export const upcomingBackground = colorPalette.purple100;export const upcomingText = colorPalette.purple700;export const upcomingBorder = colorPalette.purple500;-export const formLabelText = colorPalette.blue500;-export const altFormLabelText = colorPalette.blue700;+export const formLabelText = colorPalette.blue600;export const formLabelBackground = colorPalette.blue200;export const formInputBackground = colorPalette.navy50;export const formInputBackgroundSelected = colorPalette.white;@@ -171,27 +168,26 @@ export const formInputBackgroundSelection = colorPalette.purple500;export const formInputBorder = colorPalette.navy150;export const formInputTextReadOnlySelection = colorPalette.navy50;export const formInputBorderSelected = colorPalette.purple500;-export const altFormInputBorderSelected = colorPalette.blue500;export const formInputText = colorPalette.navy900;export const formInputTextSelected = colorPalette.navy50;export const formInputTextPlaceholder = colorPalette.navy300;export const formInputTextPlaceholderSelected = colorPalette.navy200;export const formInputTextSelection = colorPalette.navy100;export const formInputShadowSelected = colorPalette.purple300;-export const altFormInputShadowSelected = colorPalette.blue300;export const formInputTextHighlight = colorPalette.purple200;+export const checkboxText = tableBackground;+export const checkboxBackgroundSelected = colorPalette.blue500;+export const checkboxBorderSelected = colorPalette.blue500;+export const checkboxShadowSelected = colorPalette.blue300;export const pillBackground = colorPalette.navy150;export const pillText = colorPalette.navy800;export const pillTextHighlighted = colorPalette.purple600;export const pillBorder = colorPalette.navy150;-export const altPillBorder = colorPalette.navy200;+export const pillBorderDark = colorPalette.navy300;export const pillBackgroundSelected = colorPalette.blue150;export const pillTextSelected = colorPalette.blue900;export const pillBorderSelected = colorPalette.purple500;-export const altPillBackground = colorPalette.navy100;-export const altPillText = colorPalette.navy900;-export const alt2PillText = colorPalette.navy500;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;diff --git a/upcoming-release-notes/1868.md b/upcoming-release-notes/1868.mdnew file mode 100644index 0000000000..965676db0b--- /dev/null+++ b/upcoming-release-notes/1868.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [carkom]+---++Consolidating colors so they are more consistent across the app from one page to the next