17914: Replaces deprecated substr() with substring().

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

diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts
index 98380b968e8f8b0a70d8f877a50cc48b8b968b67..74dee7f6c9cec71047ad0373162b5d10dc6786d1 100644 (file)
--- a/src/common/custom-theme.ts
+++ b/src/common/custom-theme.ts
@@ -4,7 +4,6 @@
 
 import { createMuiTheme } from '@material-ui/core/styles';
 import { ThemeOptions, Theme } from '@material-ui/core/styles/createMuiTheme';
-import purple from '@material-ui/core/colors/purple';
 import blue from '@material-ui/core/colors/blue';
 import grey from '@material-ui/core/colors/grey';
 import green from '@material-ui/core/colors/green';
@@ -27,23 +26,25 @@ interface Colors {
     yellow700: string;
     red900: string;
     blue500: string;
+    purple: string;
 }
 
 const arvadosPurple = '#361336';
-const purple800 = purple["800"];
-const grey500 = grey["500"];
 const grey600 = grey["600"];
 const grey700 = grey["700"];
 const grey900 = grey["900"];
-const rocheBlue = '#06C';
 
 export const themeOptions: ArvadosThemeOptions = {
+    typography: {
+        useNextVariants: true,
+    },
     customs: {
         colors: {
             green700: green["700"],
             yellow700: yellow["700"],
             red900: red['900'],
             blue500: blue['500'],
+            purple: arvadosPurple
         }
     },
     overrides: {
@@ -66,9 +67,11 @@ export const themeOptions: ArvadosThemeOptions = {
             }
         },
         MuiTab: {
-            selected: {
-                fontWeight: 700,
-                color: arvadosPurple
+            root: {
+                '&$selected': {
+                    fontWeight: 700,
+                    color: arvadosPurple
+                }
             }
         },
         MuiList: {
@@ -96,6 +99,28 @@ export const themeOptions: ArvadosThemeOptions = {
                 fontSize: '1.25rem'
             }
         },
+        MuiExpansionPanel: {
+            expanded: {
+                marginTop: '8px',
+            }
+        },
+        MuiExpansionPanelDetails: {
+            root: {
+                marginBottom: 0,
+                paddingBottom: '4px',
+            }
+        },
+        MuiExpansionPanelSummary: {
+            content: {
+                '&$expanded': {
+                    margin: 0,
+                },
+                color: grey700,
+                fontSize: '1.25rem',
+                margin: 0,
+            },
+            expanded: {},
+        },
         MuiMenuItem: {
             root: {
                 padding: '8px 16px'
@@ -116,11 +141,11 @@ export const themeOptions: ArvadosThemeOptions = {
         },
         MuiFormLabel: {
             root: {
-                fontSize: '0.875rem'
-            },
-            focused: {
-                "&$focused:not($error)": {
-                    color: arvadosPurple
+                fontSize: '0.875rem',
+                "&$focused": {
+                    "&$focused:not($error)": {
+                        color: arvadosPurple
+                    }
                 }
             }
         },
@@ -146,7 +171,7 @@ export const themeOptions: ArvadosThemeOptions = {
             dark: teal.A400,
             contrastText: '#fff'
         }
-    }
+    },
 };
 
 export const CustomTheme = createMuiTheme(themeOptions);
\ No newline at end of file