theme-changes
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 12 Sep 2018 10:54:03 +0000 (12:54 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 12 Sep 2018 10:54:03 +0000 (12:54 +0200)
Feature #14186

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

src/common/custom-theme.ts
src/store/processes/process.ts
src/views/process-panel/subprocesses-card.tsx

index 20790100dcf2012f7f12ec6912aa30d0f56ca875..be8e77ff68b37698ec8f8fd6d438f7f03a29d5b5 100644 (file)
@@ -26,8 +26,6 @@ interface Colors {
     yellow700: string;
     red900: string;
     blue500: string;
-    grey500: string;
-    grey700: string;
 }
 
 const red900 = red["900"];
@@ -47,8 +45,6 @@ export const themeOptions: ArvadosThemeOptions = {
             yellow700: yellow["700"],
             red900: red['900'],
             blue500: blue['500'],
-            grey500,
-            grey700
         }
     },
     overrides: {
index c9e62f943455a2ebaae9b8d8b45c16ff8084a62f..ab8093b856c4c259b1bab8992e98293444f7ac78 100644 (file)
@@ -61,7 +61,7 @@ export const getProcessRuntime = ({ container }: Process) =>
         ? getTimeDiff(container.finishedAt || '', container.startedAt || '')
         : 0;
 
-export const getProcessStatusColor = (status: string, { customs }: ArvadosTheme) => {
+export const getProcessStatusColor = (status: string, { customs, palette }: ArvadosTheme) => {
     switch (status) {
         case ProcessStatus.RUNNING:
             return customs.colors.blue500;
@@ -71,7 +71,7 @@ export const getProcessStatusColor = (status: string, { customs }: ArvadosTheme)
         case ProcessStatus.FAILED:
             return customs.colors.red900;
         default:
-            return customs.colors.grey500;
+            return palette.grey["500"];
     }
 };
 
index 0607c4711e2238ea26dcefff22663ca66568d258..9cff1e981630ed6a72e8a2868bb8c70c413b22cd 100644 (file)
@@ -16,7 +16,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         height: '100%'
     },
     title: {
-        color: theme.customs.colors.grey700
+        color: theme.palette.grey["700"]
     },
     gridFilter: {
         height: '20px',