Skip to content

Commit

Permalink
Color updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joel-jeremy committed Apr 10, 2024
1 parent 4480b8a commit 1f7f5b2
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export function MobileWebMessage() {
left: 0,
right: 0,
backgroundColor: theme.menuAutoCompleteBackground,
color: theme.modalText,
color: theme.menuAutoCompleteText,
padding: 10,
margin: 10,
borderRadius: 6,
Expand Down
1 change: 0 additions & 1 deletion packages/desktop-client/src/components/common/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ export const Modal = ({
padding: 20,
position: 'relative',
flexShrink: 0,
color: theme.modalText,
}}
>
<View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ export function AccountAutocompleteModal({
return (
<Modal
title="Account"
titleStyle={{
color: theme.menuAutoCompleteText,
}}
noAnimation={!isNarrowWidth}
showHeader={isNarrowWidth}
focusAfterClose={false}
Expand All @@ -53,7 +56,7 @@ export function AccountAutocompleteModal({
title="Account"
style={{
alignSelf: 'center',
color: theme.modalText,
color: theme.menuAutoCompleteText,
marginBottom: 10,
}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ export function CategoryAutocompleteModal({
return (
<Modal
title="Category"
titleStyle={{
color: theme.menuAutoCompleteText,
}}
noAnimation={!isNarrowWidth}
showHeader={isNarrowWidth}
focusAfterClose={false}
Expand All @@ -54,7 +57,7 @@ export function CategoryAutocompleteModal({
title="Category"
style={{
alignSelf: 'center',
color: theme.modalText,
color: theme.menuAutoCompleteText,
marginBottom: 10,
}}
/>
Expand Down
6 changes: 2 additions & 4 deletions packages/desktop-client/src/components/modals/EditField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,7 @@ export function EditField({ modalProps, name, onSubmit, onClose }) {
padding: '15px 10px',
borderRadius: '6px',
...(minWidth && { minWidth }),
...(!isNarrowWidth && {
backgroundColor: theme.menuAutoCompleteBackground,
}),
backgroundColor: theme.menuAutoCompleteBackground,
}}
>
{() => (
Expand All @@ -290,7 +288,7 @@ export function EditField({ modalProps, name, onSubmit, onClose }) {
title={label}
style={{
alignSelf: 'center',
color: theme.modalText,
color: theme.menuAutoCompleteText,
marginBottom: 10,
}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export function PayeeAutocompleteModal({
return (
<Modal
title="Payee"
titleStyle={{
color: theme.menuAutoCompleteText,
}}
noAnimation={!isNarrowWidth}
showHeader={isNarrowWidth}
focusAfterClose={false}
Expand Down
1 change: 0 additions & 1 deletion packages/desktop-client/src/style/themes/dark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export const menuAutoCompleteText = colorPalette.navy200;
export const menuAutoCompleteTextHeader = colorPalette.purple200;
export const menuAutoCompleteItemText = menuItemText;

export const modalText = colorPalette.white;
export const modalBackground = colorPalette.gray800;
export const modalBorder = colorPalette.navy600;
export const mobileHeaderBackground = colorPalette.purple800;
Expand Down
1 change: 0 additions & 1 deletion packages/desktop-client/src/style/themes/development.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export const menuAutoCompleteText = colorPalette.white;
export const menuAutoCompleteTextHeader = colorPalette.orange150;
export const menuAutoCompleteItemText = menuAutoCompleteText;

export const modalText = colorPalette.white;
export const modalBackground = colorPalette.white;
export const modalBorder = colorPalette.white;
export const mobileHeaderBackground = colorPalette.purple400;
Expand Down
1 change: 0 additions & 1 deletion packages/desktop-client/src/style/themes/light.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export const menuAutoCompleteTextHeader = colorPalette.orange150;
export const menuAutoCompleteItemTextHover = menuAutoCompleteText;
export const menuAutoCompleteItemText = menuAutoCompleteText;

export const modalText = colorPalette.white;
export const modalBackground = colorPalette.white;
export const modalBorder = colorPalette.white;
export const mobileHeaderBackground = colorPalette.purple400;
Expand Down
1 change: 0 additions & 1 deletion packages/desktop-client/src/style/themes/midnight.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export const menuAutoCompleteTextHover = colorPalette.green900;
export const menuAutoCompleteTextHeader = colorPalette.purple200;
export const menuAutoCompleteItemTextHover = colorPalette.gray700;
export const menuAutoCompleteItemText = menuItemText;
export const modalText = colorPalette.white;
export const modalBackground = colorPalette.gray700;
export const modalBorder = colorPalette.gray200;
export const mobileHeaderBackground = colorPalette.gray900;
Expand Down

0 comments on commit 1f7f5b2

Please sign in to comment.