From 3d4803244cc4fd2135ab6f75f527a720ef9eee4e Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 6 Dec 2022 11:54:45 -0500 Subject: [PATCH] 19504: Revert breadcrumbs ro transparent background, use primary color for parent breadcrumbs Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/common/custom-theme.ts | 9 +++------ src/components/breadcrumbs/breadcrumbs.tsx | 11 +++-------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index 67a514b10c..89fa6f3132 100644 --- a/src/common/custom-theme.ts +++ b/src/common/custom-theme.ts @@ -29,15 +29,13 @@ interface Colors { red100: string; red900: string; blue500: string; - grey300: string; - grey400: string; grey500: string; + grey700: string; purple: string; orange: string; } const arvadosPurple = '#361336'; -const grey500 = grey["500"]; const grey600 = grey["600"]; const grey700 = grey["700"]; const grey900 = grey["900"]; @@ -55,9 +53,8 @@ export const themeOptions: ArvadosThemeOptions = { red100: red["100"], red900: red['900'], blue500: blue['500'], - grey300: grey["300"], - grey400: grey["400"], - grey500: grey500, + grey500: grey["500"], + grey700: grey["700"], purple: arvadosPurple, orange: '#f0ad4e', } diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx index 301f3041f1..1d4b7b272a 100644 --- a/src/components/breadcrumbs/breadcrumbs.tsx +++ b/src/components/breadcrumbs/breadcrumbs.tsx @@ -25,15 +25,9 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ item: { borderRadius: '16px', height: '32px', - backgroundColor: theme.customs.colors.grey300, + color: theme.customs.colors.grey700, '&.parentItem': { - backgroundColor: `${theme.customs.colors.grey300}99`, - }, - '&:hover': { - backgroundColor: theme.customs.colors.grey400, - }, - '&.parentItem:hover': { - backgroundColor: `${theme.customs.colors.grey400}99`, + color: `${theme.palette.primary.main}`, }, }, label: { @@ -84,6 +78,7 @@ export const Breadcrumbs = withStyles(styles)( isLastItem ? null : 'parentItem', classes.item )} + color="inherit" onClick={() => onClick(item)} onContextMenu={event => onContextMenu(event, item)}> -- 2.30.2