[ARVADOS-WORKBENCH2] updated: 1.2.0-326-g23b0c2a
Git user
git at public.curoverse.com
Thu Sep 6 11:26:11 EDT 2018
Summary of changes:
.../collection-panel-files.tsx | 6 +-
src/components/data-explorer/data-explorer.tsx | 6 +-
src/components/data-table/data-table.tsx | 1 +
src/components/file-tree/file-tree-item.tsx | 8 ++-
src/components/form-dialog/form-dialog.tsx | 8 ++-
src/components/icon/icon.tsx | 15 ++++-
.../context-menu/action-sets/process-action-set.ts | 5 +-
src/views-components/main-app-bar/help-menu.tsx | 73 ++++++++++++++++++++++
src/views-components/main-app-bar/main-app-bar.tsx | 5 +-
src/views/collection-panel/collection-panel.tsx | 4 +-
.../process-log-panel/process-log-main-card.tsx | 4 +-
.../process-panel/process-information-card.tsx | 4 +-
.../process-panel/process-subprocesses-card.tsx | 6 +-
src/views/trash-panel/trash-panel.tsx | 14 +++--
14 files changed, 135 insertions(+), 24 deletions(-)
create mode 100644 src/views-components/main-app-bar/help-menu.tsx
via 23b0c2abcd8913e6518f21c2c6a399751455cda0 (commit)
via 32a1e3897561f23b792d67af49c3c3e332f1ea47 (commit)
via de26557e0542c8a003fddc11831cb3646bf5512f (commit)
via ee788af733dd0dd4d4df793fccf7019094f579a2 (commit)
via 3866fea0a4b4d328006ae2e7f2a72fdd885ead7f (commit)
via 837e79c83399108aa0492f163205edb952f0ab71 (commit)
via e338eb09636536bea98e4034481ef723ece42fe9 (commit)
via de7204ffbb7255e0aa9cefb7efd06f5130b19038 (commit)
via e6a2e7528445081f7dbf1c5b3a5cf4b27a435491 (commit)
via 75e44c796b346740fd52908bef24d913e4e084ae (commit)
via 3dda59aa1622c2d11f714d96c651a68e1ce8fb09 (commit)
via d9ddb4d9b9f8868e60e96b0523496d6e5522d133 (commit)
via 35694e6fc2214c366f09ddd75c9910d91cd3ed20 (commit)
via b4ed0cfb0fc7a1588a90e6a778d9a4c00ee7a84d (commit)
via ccd25ad858c7961eaa797f01bdfed94f6c6eed29 (commit)
via ec2c8cbaac7628b5d2bd3d65b89b93af0e95c33b (commit)
via 322c6c8d158454ebda0c92cff3a9215a743b6e89 (commit)
via cbd013127744bc5bf3cf3a4159dcf3d6f2b43855 (commit)
via ec729054acd0b6208fbb4a290b32dffe6df7a0e3 (commit)
via e643603dd9a121a3d39488fd29945a5af1bf161c (commit)
from e6079cd17a140bb75d4b104161902d487823aa36 (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 23b0c2abcd8913e6518f21c2c6a399751455cda0
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Sep 6 17:25:56 2018 +0200
Add help menu to main-app-bar
Feature #14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski 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 de3ed3b..2660422 100644
--- a/src/views-components/main-app-bar/help-menu.tsx
+++ b/src/views-components/main-app-bar/help-menu.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { MenuItem, Typography } from "@material-ui/core";
+import { MenuItem, Typography, ListSubheader } from "@material-ui/core";
import { DropdownMenu } from "~/components/dropdown-menu/dropdown-menu";
import { ImportContactsIcon, HelpIcon } from "~/components/icon/icon";
import { ArvadosTheme } from '~/common/custom-theme';
@@ -58,15 +58,13 @@ export const HelpMenu = withStyles(styles)(
icon={<HelpIcon />}
id="help-menu"
title="Help">
- <li className={classes.title}>
- <Typography variant="body1">Help</Typography>
- </li>
+ <MenuItem disabled>Help</MenuItem>
{
links.map(link =>
<MenuItem key={link.title}>
<a href={link.link} target="_blank" className={classes.link}>
- <ImportContactsIcon className={classes.icon} />
- <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
+ <ImportContactsIcon className={classes.icon} />
+ <Typography variant="body1" className={classes.linkTitle}>{link.title}</Typography>
</a>
</MenuItem>
)
diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index c25b110..6779d47 100644
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -63,7 +63,8 @@ export const MainAppBar = withStyles(styles)(
xs={3}
container
alignItems="center"
- justify="flex-end">
+ justify="flex-end"
+ wrap="nowrap">
{props.user
? <>
<NotificationsMenu />
commit 32a1e3897561f23b792d67af49c3c3e332f1ea47
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Sep 6 17:13:52 2018 +0200
Add help menu to main-app-bar
Feature #14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index bb42e23..c25b110 100644
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -12,6 +12,7 @@ import { Routes } from '~/routes/routes';
import { NotificationsMenu } from "~/views-components/main-app-bar/notifications-menu";
import { AccountMenu } from "~/views-components/main-app-bar/account-menu";
import { AnonymousMenu } from "~/views-components/main-app-bar/anonymous-menu";
+import { HelpMenu } from './help-menu';
type CssRules = 'link';
@@ -67,6 +68,7 @@ export const MainAppBar = withStyles(styles)(
? <>
<NotificationsMenu />
<AccountMenu />
+ <HelpMenu />
</>
: <AnonymousMenu />}
</Grid>
commit de26557e0542c8a003fddc11831cb3646bf5512f
Merge: e6079cd ee788af
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Sep 6 17:09:57 2018 +0200
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14149-change-app-bar-layout
refs #2
14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list