From: Janicki Artur <artur.janicki@contractors.roche.com>
Date: Thu, 13 Sep 2018 08:39:21 +0000 (+0200)
Subject: Merge branch 'master' into 14137-new-button
X-Git-Tag: 1.3.0~98^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/78fd0936352c6f50f06bd0c6f9973bccc1ac0d51

Merge branch 'master' into 14137-new-button

refs #14137

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>
---

78fd0936352c6f50f06bd0c6f9973bccc1ac0d51
diff --cc src/views/workbench/workbench.tsx
index 3f61c521,5c4648b6..db389572
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -40,10 -40,11 +40,11 @@@ import { MoveCollectionDialog } from '~
  import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
  import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
- import { MainContentBar } from '../../views-components/main-content-bar/main-content-bar';
+ import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
+ import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
  
 -type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
 +type CssRules = 'root' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {