Merge branch 'master'

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

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index c85acd9089b0011ac2a819068b55d1ce5fd35688..ecad39134d1652e07d11b58d8da524fdad7cca29 100644 (file)
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -16,11 +16,17 @@ interface ArvadosThemeOptions extends ThemeOptions {
 }
 
 export interface ArvadosTheme extends Theme {
-    customs: any;
+    customs: {
+        colors: Colors
+    };
+}
+
+interface Colors {
+    green700: string;
+    yellow700: string;
 }
 
 const red900 = red["900"];
-const yellow700 = yellow["700"];
 const purple800 = purple["800"];
 const grey200 = grey["200"];
 const grey300 = grey["300"];
@@ -32,7 +38,8 @@ const grey900 = grey["900"];
 const themeOptions: ArvadosThemeOptions = {
     customs: {
         colors: {
-            green700: green["700"]
+            green700: green["700"],
+            yellow700: yellow["700"]
         }
     },
     overrides: {
@@ -74,6 +81,38 @@ const themeOptions: ArvadosThemeOptions = {
             root: {
                 fontSize: '1.25rem'
             }
+        },
+        MuiCardHeader: {
+            avatar: {
+                display: 'flex',
+                alignItems: 'center'
+            },
+            title: {
+                color: grey700,
+                fontSize: '1.25rem'
+            }
+        },
+        MuiMenuItem: {
+            root: {
+                padding: '8px 16px'
+            }
+        },
+        MuiInput: {
+            underline: {
+                '&:after': {
+                    borderBottomColor: purple800
+                },
+                '&:hover:not($disabled):not($focused):not($error):before': {
+                    borderBottom: '1px solid inherit'
+                }
+            }
+        },
+        MuiFormLabel: {
+            focused: {
+                "&$focused:not($error)": {
+                    color: purple800
+                }
+            }
         }
     },
     mixins: {