Skip to content
Snippets Groups Projects
Unverified Commit da6b039f authored by Jenna's avatar Jenna Committed by GitHub
Browse files

Bugfix:Midnight theme button contrast (#2538)


* added green700 (g3) to highlight text in PayeeAutocomplete and CategoryAutocomplete

* added upcoming release note doc for Isuee 2488

* modified background and text to meet WCAG AA compliance for contrast

* updated code for autocomplete highlight on menu items

* fixed linting errors and renamed release note

* updated release note category from 'bug' to 'bugfix'

* fixing the light theme

---------

Co-authored-by: default avatarJenn Cox <jenncox@Jenns-MacBook-Air.local>
parent 310cc04a
No related branches found
No related tags found
No related merge requests found
...@@ -261,7 +261,9 @@ function SplitTransactionButton({ ...@@ -261,7 +261,9 @@ function SplitTransactionButton({
alignItems: 'center', alignItems: 'center',
fontSize: 11, fontSize: 11,
fontWeight: 500, fontWeight: 500,
color: theme.noticeTextMenu, color: highlighted
? theme.menuAutoCompleteTextHover
: theme.noticeTextMenu,
padding: '6px 8px', padding: '6px 8px',
':active': { ':active': {
backgroundColor: 'rgba(100, 100, 100, .25)', backgroundColor: 'rgba(100, 100, 100, .25)',
...@@ -297,7 +299,8 @@ type CategoryItemProps = { ...@@ -297,7 +299,8 @@ type CategoryItemProps = {
embedded?: boolean; embedded?: boolean;
}; };
function CategoryItem({ // eslint-disable-next-line import/no-unused-modules
export function CategoryItem({
item, item,
className, className,
style, style,
...@@ -309,6 +312,7 @@ function CategoryItem({ ...@@ -309,6 +312,7 @@ function CategoryItem({
const narrowStyle = isNarrowWidth const narrowStyle = isNarrowWidth
? { ? {
...styles.mobileMenuItem, ...styles.mobileMenuItem,
color: theme.menuAutoCompleteText,
borderRadius: 0, borderRadius: 0,
borderTop: `1px solid ${theme.pillBorder}`, borderTop: `1px solid ${theme.pillBorder}`,
} }
...@@ -324,6 +328,12 @@ function CategoryItem({ ...@@ -324,6 +328,12 @@ function CategoryItem({
backgroundColor: highlighted backgroundColor: highlighted
? theme.menuAutoCompleteBackgroundHover ? theme.menuAutoCompleteBackgroundHover
: 'transparent', : 'transparent',
color: highlighted
? theme.menuAutoCompleteItemTextHover
: theme.menuAutoCompleteItemText,
':hover': {
color: theme.menuAutoCompleteItemTextHover,
},
padding: 4, padding: 4,
paddingLeft: 20, paddingLeft: 20,
borderRadius: embedded ? 4 : 0, borderRadius: embedded ? 4 : 0,
......
...@@ -421,8 +421,9 @@ export function CreatePayeeButton({ ...@@ -421,8 +421,9 @@ export function CreatePayeeButton({
style={{ style={{
display: 'block', display: 'block',
flexShrink: 0, flexShrink: 0,
color: color: highlighted
embedded && isNarrowWidth ? theme.menuItemText : theme.noticeTextMenu, ? theme.menuAutoCompleteTextHover
: theme.noticeTextMenu,
borderRadius: embedded ? 4 : 0, borderRadius: embedded ? 4 : 0,
fontSize: 11, fontSize: 11,
fontWeight: 500, fontWeight: 500,
...@@ -483,6 +484,7 @@ function PayeeItem({ ...@@ -483,6 +484,7 @@ function PayeeItem({
const narrowStyle = isNarrowWidth const narrowStyle = isNarrowWidth
? { ? {
...styles.mobileMenuItem, ...styles.mobileMenuItem,
color: theme.menuAutoCompleteText,
borderRadius: 0, borderRadius: 0,
borderTop: `1px solid ${theme.pillBorder}`, borderTop: `1px solid ${theme.pillBorder}`,
} }
...@@ -517,6 +519,12 @@ function PayeeItem({ ...@@ -517,6 +519,12 @@ function PayeeItem({
backgroundColor: highlighted backgroundColor: highlighted
? theme.menuAutoCompleteBackgroundHover ? theme.menuAutoCompleteBackgroundHover
: 'transparent', : 'transparent',
color: highlighted
? theme.menuAutoCompleteItemTextHover
: theme.menuAutoCompleteItemText,
':hover': {
color: theme.menuAutoCompleteItemTextHover,
},
borderRadius: embedded ? 4 : 0, borderRadius: embedded ? 4 : 0,
padding: 4, padding: 4,
paddingLeft: 20, paddingLeft: 20,
......
...@@ -61,6 +61,7 @@ export const menuAutoCompleteBackground = colorPalette.navy900; ...@@ -61,6 +61,7 @@ export const menuAutoCompleteBackground = colorPalette.navy900;
export const menuAutoCompleteBackgroundHover = colorPalette.navy600; export const menuAutoCompleteBackgroundHover = colorPalette.navy600;
export const menuAutoCompleteText = colorPalette.navy200; export const menuAutoCompleteText = colorPalette.navy200;
export const menuAutoCompleteTextHeader = colorPalette.purple200; export const menuAutoCompleteTextHeader = colorPalette.purple200;
export const menuAutoCompleteItemText = menuItemText;
export const modalBackground = colorPalette.gray800; export const modalBackground = colorPalette.gray800;
export const modalBorder = colorPalette.navy600; export const modalBorder = colorPalette.navy600;
......
...@@ -61,6 +61,7 @@ export const menuAutoCompleteBackground = colorPalette.navy900; ...@@ -61,6 +61,7 @@ export const menuAutoCompleteBackground = colorPalette.navy900;
export const menuAutoCompleteBackgroundHover = colorPalette.navy600; export const menuAutoCompleteBackgroundHover = colorPalette.navy600;
export const menuAutoCompleteText = colorPalette.white; export const menuAutoCompleteText = colorPalette.white;
export const menuAutoCompleteTextHeader = colorPalette.orange150; export const menuAutoCompleteTextHeader = colorPalette.orange150;
export const menuAutoCompleteItemText = menuAutoCompleteText;
export const modalBackground = colorPalette.white; export const modalBackground = colorPalette.white;
export const modalBorder = colorPalette.white; export const modalBorder = colorPalette.white;
......
...@@ -60,7 +60,10 @@ export const menuKeybindingText = colorPalette.navy400; ...@@ -60,7 +60,10 @@ export const menuKeybindingText = colorPalette.navy400;
export const menuAutoCompleteBackground = colorPalette.navy900; export const menuAutoCompleteBackground = colorPalette.navy900;
export const menuAutoCompleteBackgroundHover = colorPalette.navy600; export const menuAutoCompleteBackgroundHover = colorPalette.navy600;
export const menuAutoCompleteText = colorPalette.white; export const menuAutoCompleteText = colorPalette.white;
export const menuAutoCompleteTextHover = colorPalette.green150;
export const menuAutoCompleteTextHeader = colorPalette.orange150; export const menuAutoCompleteTextHeader = colorPalette.orange150;
export const menuAutoCompleteItemTextHover = menuAutoCompleteText;
export const menuAutoCompleteItemText = menuAutoCompleteText;
export const modalBackground = colorPalette.white; export const modalBackground = colorPalette.white;
export const modalBorder = colorPalette.white; export const modalBorder = colorPalette.white;
......
...@@ -50,7 +50,7 @@ export const sidebarItemTextSelected = colorPalette.purple200; ...@@ -50,7 +50,7 @@ export const sidebarItemTextSelected = colorPalette.purple200;
export const menuBackground = colorPalette.gray700; export const menuBackground = colorPalette.gray700;
export const menuItemBackground = colorPalette.gray200; export const menuItemBackground = colorPalette.gray200;
export const menuItemBackgroundHover = colorPalette.gray500; export const menuItemBackgroundHover = colorPalette.gray500;
export const menuItemText = colorPalette.gray100; export const menuItemText = colorPalette.gray100; /* controls all dropdowns */
export const menuItemTextHover = colorPalette.gray50; export const menuItemTextHover = colorPalette.gray50;
export const menuItemTextSelected = colorPalette.purple400; export const menuItemTextSelected = colorPalette.purple400;
export const menuItemTextHeader = colorPalette.purple200; export const menuItemTextHeader = colorPalette.purple200;
...@@ -58,10 +58,12 @@ export const menuBorder = colorPalette.gray800; ...@@ -58,10 +58,12 @@ export const menuBorder = colorPalette.gray800;
export const menuBorderHover = colorPalette.purple300; export const menuBorderHover = colorPalette.purple300;
export const menuKeybindingText = colorPalette.gray500; export const menuKeybindingText = colorPalette.gray500;
export const menuAutoCompleteBackground = colorPalette.gray600; export const menuAutoCompleteBackground = colorPalette.gray600;
export const menuAutoCompleteBackgroundHover = colorPalette.gray300; export const menuAutoCompleteBackgroundHover = colorPalette.gray50;
export const menuAutoCompleteText = colorPalette.gray100; export const menuAutoCompleteText = colorPalette.gray100;
export const menuAutoCompleteTextHover = colorPalette.green900;
export const menuAutoCompleteTextHeader = colorPalette.purple200; export const menuAutoCompleteTextHeader = colorPalette.purple200;
export const menuAutoCompleteItemTextHover = colorPalette.gray700;
export const menuAutoCompleteItemText = menuItemText;
export const modalBackground = colorPalette.gray700; export const modalBackground = colorPalette.gray700;
export const modalBorder = colorPalette.gray200; export const modalBorder = colorPalette.gray200;
export const mobileHeaderBackground = colorPalette.gray900; export const mobileHeaderBackground = colorPalette.gray900;
...@@ -140,6 +142,7 @@ export const noticeText = colorPalette.green300; ...@@ -140,6 +142,7 @@ export const noticeText = colorPalette.green300;
export const noticeTextLight = colorPalette.green400; export const noticeTextLight = colorPalette.green400;
export const noticeTextDark = colorPalette.green150; export const noticeTextDark = colorPalette.green150;
export const noticeTextMenu = colorPalette.green400; export const noticeTextMenu = colorPalette.green400;
export const noticeTextMenuHover = colorPalette.green700;
export const noticeBorder = colorPalette.green800; export const noticeBorder = colorPalette.green800;
export const warningBackground = colorPalette.orange800; export const warningBackground = colorPalette.orange800;
export const warningText = colorPalette.orange200; export const warningText = colorPalette.orange200;
......
---
category: Bugfix
authors: [Jenna59]
---
Improve contrast in Payee autocomplete's "Create payee" and Category autocomplete's "Split transaction" buttons
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment