cr changes

Feature #14125

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@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 8128b7f4d3f0e47acff71ca1df24afb385b5502a..2c56c85e27669395a2d4eb0cbe591c6844035981 100644 (file)
--- 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 3c281087c2addf20ad8f3f6e7e31500673a28782..ce7c74ce570e5143313aa0e001af24f330fb2165 100644 (file)
--- 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}