Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / components / breadcrumbs / breadcrumbs.tsx

diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 0348b8144a5b920e92d8b884ba186229cc8a6917..baf84d1da253fd2ac266eac6ba7b2215d004a1a2 100644 (file)
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -10,6 +10,8 @@ import { IllegalNamingWarning } from '../warning/warning';
 import { IconType, FreezeIcon } from 'components/icon/icon';
 import grey from '@material-ui/core/colors/grey';
 import { ResourcesState } from 'store/resources/resources';
+import classNames from 'classnames';
+import { ArvadosTheme } from 'common/custom-theme';
 
 export interface Breadcrumb {
     label: string;
@@ -17,27 +19,40 @@ export interface Breadcrumb {
     uuid: string;
 }
 
-type CssRules = "item" | "currentItem" | "label" | "icon" | "frozenIcon";
+type CssRules = "item" | "chevron" | "label" | "buttonLabel" | "icon" | "frozenIcon";
 
-const styles: StyleRulesCallback<CssRules> = theme => ({
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     item: {
-        opacity: 0.6
+        borderRadius: '16px',
+        height: '32px',
+        minWidth: '36px',
+        color: theme.customs.colors.grey700,
+        '&.parentItem': {
+            color: `${theme.palette.primary.main}`,
+        },
     },
-    currentItem: {
-        opacity: 1
+    chevron: {
+        color: grey["600"],
     },
     label: {
-        textTransform: "none"
+        textTransform: "none",
+        paddingRight: '3px',
+        paddingLeft: '3px',
+        lineHeight: '1.4',
+    },
+    buttonLabel: {
+        overflow: 'hidden',
+        justifyContent: 'flex-start',
     },
     icon: {
         fontSize: 20,
         color: grey["600"],
-        marginRight: '10px',
+        marginRight: '5px',
     },
     frozenIcon: {
         fontSize: 20,
         color: grey["600"],
-        marginLeft: '10px',
+        marginLeft: '3px',
     },
 });
 
@@ -67,8 +82,14 @@ export const Breadcrumbs = withStyles(styles)(
                                 : isLastItem
                                     ? 'breadcrumb-last'
                                     : false}
+                            className={classNames(
+                                isLastItem ? null : 'parentItem',
+                                classes.item
+                            )}
+                            classes={{
+                                label: classes.buttonLabel
+                            }}
                             color="inherit"
-                            className={isLastItem ? classes.currentItem : classes.item}
                             onClick={() => onClick(item)}
                             onContextMenu={event => onContextMenu(event, item)}>
                             <Icon className={classes.icon} />
@@ -83,7 +104,7 @@ export const Breadcrumbs = withStyles(styles)(
                             }
                         </Button>
                     </Tooltip>
-                    {!isLastItem && <ChevronRightIcon color="inherit" className={classes.item} />}
+                    {!isLastItem && <ChevronRightIcon color="inherit" className={classNames('parentItem', classes.chevron)} />}
                 </React.Fragment>
             );
         })