X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/7a8fafa13f5f94945cf0a4c5965db273f3435823..4b961d16b8f8ef8afbd13697a79fe4684acd0416:/src/common/custom-theme.ts diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index 20790100..0faf781d 100644 --- a/src/common/custom-theme.ts +++ b/src/common/custom-theme.ts @@ -10,6 +10,7 @@ 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'; export interface ArvadosThemeOptions extends ThemeOptions { customs: any; @@ -26,14 +27,11 @@ interface Colors { yellow700: string; red900: string; blue500: string; - grey500: string; - grey700: 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"]; @@ -41,14 +39,16 @@ 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'], - grey500, - grey700 + purple: arvadosPurple } }, overrides: { @@ -59,7 +59,7 @@ export const themeOptions: ArvadosThemeOptions = { }, MuiAppBar: { colorPrimary: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTabs: { @@ -67,13 +67,13 @@ export const themeOptions: ArvadosThemeOptions = { color: grey600 }, indicator: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTab: { selected: { fontWeight: 700, - color: purple800 + color: arvadosPurple } }, MuiList: { @@ -112,7 +112,7 @@ export const themeOptions: ArvadosThemeOptions = { }, underline: { '&:after': { - borderBottomColor: purple800 + borderBottomColor: arvadosPurple }, '&:hover:not($disabled):not($focused):not($error):before': { borderBottom: '1px solid inherit' @@ -125,9 +125,19 @@ export const themeOptions: ArvadosThemeOptions = { }, focused: { "&$focused:not($error)": { - color: purple800 + color: arvadosPurple } } + }, + MuiStepIcon: { + root: { + '&$active': { + color: arvadosPurple + }, + '&$completed': { + color: 'inherited' + }, + } } }, mixins: { @@ -137,10 +147,11 @@ export const themeOptions: ArvadosThemeOptions = { }, palette: { primary: { - main: rocheBlue, - dark: blue.A100 + main: teal.A700, + dark: teal.A400, + contrastText: '#fff' } - } + }, }; export const CustomTheme = createMuiTheme(themeOptions); \ No newline at end of file