[ARVADOS-WORKBENCH2] updated: 1.2.0-308-g35694e6
Git user
git at public.curoverse.com
Thu Sep 6 08:40:24 EDT 2018
Summary of changes:
src/views-components/main-app-bar/help-menu.tsx | 30 ++++++++++++++++---------
src/views/workbench/workbench.tsx | 2 ++
2 files changed, 22 insertions(+), 10 deletions(-)
via 35694e6fc2214c366f09ddd75c9910d91cd3ed20 (commit)
from b4ed0cfb0fc7a1588a90e6a778d9a4c00ee7a84d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 35694e6fc2214c366f09ddd75c9910d91cd3ed20
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Sep 6 14:40:12 2018 +0200
cr changes
Feature #14125
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views-components/main-app-bar/help-menu.tsx b/src/views-components/main-app-bar/help-menu.tsx
index 8128b7f..2c56c85 100644
--- a/src/views-components/main-app-bar/help-menu.tsx
+++ b/src/views-components/main-app-bar/help-menu.tsx
@@ -9,24 +9,29 @@ import { ImportContactsIcon, HelpIcon } from "~/components/icon/icon";
import { ArvadosTheme } from '~/common/custom-theme';
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
-type CssRules = 'link' | 'icon' | 'title' | 'linkTitle';
+type CssRules = 'link' | 'icon' | 'title' | 'linkTitle' | 'linkContent';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
link: {
textDecoration: 'none',
- color: 'inherit'
+ color: 'inherit',
+ width: '100%',
},
icon: {
width: '16px',
height: '16px'
},
title: {
- marginLeft: theme.spacing.unit * 2,
paddingBottom: theme.spacing.unit * 0.5,
+ paddingLeft: theme.spacing.unit * 2,
+ paddingTop: theme.spacing.unit * 0.5,
outline: 'none',
},
linkTitle: {
marginLeft: theme.spacing.unit
+ },
+ linkContent: {
+ display: 'flex'
}
});
@@ -55,15 +60,20 @@ export const HelpMenu = withStyles(styles)(
icon={<HelpIcon />}
id="help-menu"
title="Help">
- <Typography variant="body1" className={classes.title}>Help</Typography>
+ <li className={classes.title}>
+ <Typography variant="body1">Help</Typography>
+ </li>
{
links.map(link =>
- <a key={link.title} href={link.link} target="_blank" className={classes.link}>
- <MenuItem>
- <ImportContactsIcon className={classes.icon} />
- <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
- </MenuItem>
- </a>)
+ <MenuItem key={link.title}>
+ <a href={link.link} target="_blank" className={classes.link}>
+ <div className={classes.linkContent}>
+ <ImportContactsIcon className={classes.icon} />
+ <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
+ </div>
+ </a>
+ </MenuItem>
+ )
}
</DropdownMenu>
);
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 3c28108..ce7c74c 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -40,6 +40,7 @@ import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/fil
import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
import { TrashPanel } from "~/views/trash-panel/trash-panel";
+import { HelpMenu } from '~/views-components/main-app-bar/help-menu.tsx';
const APP_BAR_HEIGHT = 100;
@@ -153,6 +154,7 @@ export const Workbench = withStyles(styles)(
return (
<div className={classes.root}>
<div className={classes.appBar}>
+ <HelpMenu/>
<MainAppBar
breadcrumbs={Breadcrumbs}
searchText={this.state.searchText}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list