X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c16bd80e93d4f5613f4c0a8ef973502932c62486..a2e786b48045eb414c39c3265ab2992712706711:/src/common/custom-theme.ts?ds=sidebyside diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index ecad3913..f7559eed 100644 --- 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; } @@ -24,22 +25,27 @@ export interface ArvadosTheme extends Theme { interface Colors { green700: string; yellow700: string; + red900: string; + blue500: 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"] + yellow700: yellow["700"], + red900: red['900'], + blue500: blue['500'], + purple: arvadosPurple } }, overrides: { @@ -50,7 +56,7 @@ const themeOptions: ArvadosThemeOptions = { }, MuiAppBar: { colorPrimary: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTabs: { @@ -58,13 +64,13 @@ const themeOptions: ArvadosThemeOptions = { color: grey600 }, indicator: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTab: { selected: { fontWeight: 700, - color: purple800 + color: arvadosPurple } }, MuiList: { @@ -98,9 +104,12 @@ const themeOptions: ArvadosThemeOptions = { } }, MuiInput: { + root: { + fontSize: '0.875rem' + }, underline: { '&:after': { - borderBottomColor: purple800 + borderBottomColor: arvadosPurple }, '&:hover:not($disabled):not($focused):not($error):before': { borderBottom: '1px solid inherit' @@ -108,11 +117,24 @@ const themeOptions: ArvadosThemeOptions = { } }, MuiFormLabel: { + root: { + fontSize: '0.875rem' + }, focused: { "&$focused:not($error)": { - color: purple800 + color: arvadosPurple } } + }, + MuiStepIcon: { + root: { + '&$active': { + color: arvadosPurple + }, + '&$completed': { + color: 'inherited' + }, + } } }, mixins: { @@ -122,8 +144,9 @@ const themeOptions: ArvadosThemeOptions = { }, palette: { primary: { - main: '#06C', - dark: blue.A100 + main: teal.A700, + dark: teal.A400, + contrastText: '#fff' } } };