From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 17 Sep 2018 07:13:24 +0000 (+0200)
Subject: Merge branch 'master' into 13751-shared-with-me-view
X-Git-Tag: 1.3.0~93^2~7
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/0a97d1cc5eedb11445af4b675c57b8cbdb4f1af3

Merge branch 'master' into 13751-shared-with-me-view

refs #13751

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

0a97d1cc5eedb11445af4b675c57b8cbdb4f1af3
diff --cc src/views/workbench/workbench.tsx
index fee7652b,db389572..9f1ab478
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -42,10 -42,9 +42,10 @@@ import { PartialCopyCollectionDialog } 
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
  import { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
 +import { SharedWithMePanel } from '../shared-with-me-panel/shared-with-me-panel';
  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: {