Skip to content

Commit

Permalink
Merge branch 'master' of github.com:kalmhq/kalm
Browse files Browse the repository at this point in the history
  • Loading branch information
davidqhr committed Aug 16, 2020
2 parents 0cd350e + de31a74 commit 172146c
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions frontend/src/layout/AppBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@ const styles = (theme: Theme) =>
shrinkButton: {
// margin: `0 10px`
},
barTitle: {
color: theme.palette.primary.light,
breadcrumb: {
color: "#eeeeee",
},
breadLink: {
color: "#eeeeee",
fontSize: "18px",
fontWeight: "normal",
padding: "0 0",
Expand All @@ -82,7 +85,6 @@ const styles = (theme: Theme) =>
},
"&:hover": {
color: "white",
// fontWeight: "bold",
borderBottom: "2px solid white",
},
},
Expand Down Expand Up @@ -239,28 +241,28 @@ class AppBarComponentRaw extends React.PureComponent<Props, State> {
{isOpenRootDrawer ? <MenuOpenIcon color="white" /> : <MenuIcon color="white" />}
</IconButton>
<FlexRowItemCenterBox>
<Breadcrumbs aria-label="breadcrumb">
<Breadcrumbs aria-label="breadcrumb" className={classes.breadcrumb}>
{pathArray.map((path, index) => {
if (path === "cluster") {
return null;
} else if (index === 0) {
return (
<Link key={index} className={classes.barTitle} to="/" onClick={() => blinkTopProgressAction()}>
<Link key={index} className={classes.breadLink} to="/" onClick={() => blinkTopProgressAction()}>
<KalmLogo2Icon />
<KalmTextLogoIcon />
</Link>
);
} else if (index + 1 === pathArray.length) {
return (
<span key={index} className={`${classes.barTitle} disabled`}>
<span key={index} className={`${classes.breadLink} disabled`}>
{this.renderBreadcrumbContent(path)}
</span>
);
} else {
return (
<Link
key={index}
className={classes.barTitle}
className={classes.breadLink}
to={pathArray.slice(0, index + 1).join("/")}
onClick={() => blinkTopProgressAction()}
>
Expand Down

0 comments on commit 172146c

Please sign in to comment.