[ARVADOS-WORKBENCH2] updated: 1.1.4-234-gc60e9f2

[Git user]

Summary of changes:
 .../details-panel/details-panel.tsx                |  3 +--
 src/views/workbench/workbench.test.tsx             | 25 +++++++++-------------
 2 files changed, 11 insertions(+), 17 deletions(-)

       via  c60e9f293d24ee19d3186410fb62cdcb9c2dc466 (commit)
       via  92a7124fa9784501e320f97a68f72aca0632732e (commit)
      from  a174a1b150360f57be704afcdc2a36ec8fdab98a (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 c60e9f293d24ee19d3186410fb62cdcb9c2dc466
Merge: a174a1b 92a7124
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 10 12:47:15 2018 +0200

    Merge branch '13775-custom-theme-test-errors'
    
    refs #13775
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


commit 92a7124fa9784501e320f97a68f72aca0632732e
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 10 12:46:47 2018 +0200

    Apply temporary fix
    
    Feature #13775
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx
index be257e8..9d25d92 100644
--- a/src/views-components/details-panel/details-panel.tsx
+++ b/src/views-components/details-panel/details-panel.tsx
@@ -107,8 +107,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         color: theme.palette.grey["600"],
         margin: `${theme.spacing.unit}px 0`,
         '& .fa-cogs': {
-            fontSize: "24px",
-            color: theme.customs.colors.green700
+            fontSize: "24px"
         }
 	},
 	tabContainer: {
diff --git a/src/views/workbench/workbench.test.tsx b/src/views/workbench/workbench.test.tsx
index 6edebaf..71bc915 100644
--- a/src/views/workbench/workbench.test.tsx
+++ b/src/views/workbench/workbench.test.tsx
@@ -9,27 +9,22 @@ import { Provider } from "react-redux";
 import configureStore from "../../store/store";
 import createBrowserHistory from "history/createBrowserHistory";
 import { ConnectedRouter } from "react-router-redux";
+import { MuiThemeProvider } from '@material-ui/core';
+import { CustomTheme } from '../../common/custom-theme';
 
 const history = createBrowserHistory();
 
 it('renders without crashing', () => {
     const div = document.createElement('div');
-    const store = configureStore({
-        projects: {
-            items: [],
-            currentItemId: ""
-        },
-        collections: [],
-        router: { location: null },
-        auth: {},
-        sidePanel: []
-    }, createBrowserHistory());
+    const store = configureStore(createBrowserHistory());
     ReactDOM.render(
-        <Provider store={store}>
-            <ConnectedRouter history={history}>
-                <Workbench/>
-            </ConnectedRouter>
-        </Provider>,
+        <MuiThemeProvider theme={CustomTheme}>
+            <Provider store={store}>
+                <ConnectedRouter history={history}>
+                    <Workbench/>
+                </ConnectedRouter>
+            </Provider>
+        </MuiThemeProvider>,
     div);
     ReactDOM.unmountComponentAtNode(div);
 });

-----------------------------------------------------------------------


hooks/post-receive
--