Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 14316-improve...

[arvados-workbench2.git] / src / common / custom-theme.ts

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index b47bd518a1867ae267c6eebffccdebc205671e4a..f7559eed08050876519c215745d45e447d9cb0b0 100644 (file)
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -10,8 +10,9 @@ import grey from '@material-ui/core/colors/grey';
 import green from '@material-ui/core/colors/green';
 import yellow from '@material-ui/core/colors/yellow';
 import red from '@material-ui/core/colors/red';
+import teal from '@material-ui/core/colors/teal';
 
-interface ArvadosThemeOptions extends ThemeOptions {
+export interface ArvadosThemeOptions extends ThemeOptions {
     customs: any;
 }
 
@@ -26,27 +27,25 @@ interface Colors {
     yellow700: string;
     red900: string;
     blue500: string;
-    grey500: string;
+    purple: string;
 }
 
-const red900 = red["900"];
+const arvadosPurple = '#361336';
 const purple800 = purple["800"];
-const grey200 = grey["200"];
-const grey300 = grey["300"];
 const grey500 = grey["500"];
 const grey600 = grey["600"];
 const grey700 = grey["700"];
 const grey900 = grey["900"];
 const rocheBlue = '#06C';
 
-const themeOptions: ArvadosThemeOptions = {
+export const themeOptions: ArvadosThemeOptions = {
     customs: {
         colors: {
             green700: green["700"],
             yellow700: yellow["700"],
             red900: red['900'],
             blue500: blue['500'],
-            grey500,
+            purple: arvadosPurple
         }
     },
     overrides: {
@@ -57,7 +56,7 @@ const themeOptions: ArvadosThemeOptions = {
         },
         MuiAppBar: {
             colorPrimary: {
-                backgroundColor: purple800
+                backgroundColor: arvadosPurple
             }
         },
         MuiTabs: {
@@ -65,13 +64,13 @@ const themeOptions: ArvadosThemeOptions = {
                 color: grey600
             },
             indicator: {
-                backgroundColor: purple800
+                backgroundColor: arvadosPurple
             }
         },
         MuiTab: {
             selected: {
                 fontWeight: 700,
-                color: purple800
+                color: arvadosPurple
             }
         },
         MuiList: {
@@ -110,7 +109,7 @@ const themeOptions: ArvadosThemeOptions = {
             },
             underline: {
                 '&:after': {
-                    borderBottomColor: purple800
+                    borderBottomColor: arvadosPurple
                 },
                 '&:hover:not($disabled):not($focused):not($error):before': {
                     borderBottom: '1px solid inherit'
@@ -123,9 +122,19 @@ const themeOptions: ArvadosThemeOptions = {
             },
             focused: {
                 "&$focused:not($error)": {
-                    color: purple800
+                    color: arvadosPurple
                 }
             }
+        },
+        MuiStepIcon: {
+            root: {
+                '&$active': {
+                    color: arvadosPurple
+                },
+                '&$completed': {
+                    color: 'inherited'
+                },
+            }
         }
     },
     mixins: {
@@ -135,8 +144,9 @@ const themeOptions: ArvadosThemeOptions = {
     },
     palette: {
         primary: {
-            main: rocheBlue,
-            dark: blue.A100
+            main: teal.A700,
+            dark: teal.A400,
+            contrastText: '#fff'
         }
     }
 };