From ca8b222695a58831ea5b2aeb62195f74a0808d6b Mon Sep 17 00:00:00 2001 From: Janicki Artur Date: Fri, 14 Sep 2018 07:20:03 +0200 Subject: [PATCH] change primary and secondary color Feature #14084 Arvados-DCO-1.1-Signed-off-by: Janicki Artur --- src/common/custom-theme.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index 20790100dc..3d56f78b5c 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; @@ -30,10 +31,8 @@ interface Colors { grey700: 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"]; @@ -59,7 +58,7 @@ export const themeOptions: ArvadosThemeOptions = { }, MuiAppBar: { colorPrimary: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTabs: { @@ -67,13 +66,13 @@ export const themeOptions: ArvadosThemeOptions = { color: grey600 }, indicator: { - backgroundColor: purple800 + backgroundColor: arvadosPurple } }, MuiTab: { selected: { fontWeight: 700, - color: purple800 + color: arvadosPurple } }, MuiList: { @@ -112,7 +111,7 @@ export const themeOptions: ArvadosThemeOptions = { }, underline: { '&:after': { - borderBottomColor: purple800 + borderBottomColor: arvadosPurple }, '&:hover:not($disabled):not($focused):not($error):before': { borderBottom: '1px solid inherit' @@ -125,7 +124,7 @@ export const themeOptions: ArvadosThemeOptions = { }, focused: { "&$focused:not($error)": { - color: purple800 + color: arvadosPurple } } } @@ -137,8 +136,9 @@ export const themeOptions: ArvadosThemeOptions = { }, palette: { primary: { - main: rocheBlue, - dark: blue.A100 + main: teal.A700, + dark: blue.A100, + contrastText: '#fff' } } }; -- 2.30.2