X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5941908e7a1d369ca823702f60e8fd048ae08a9a..84b9323c26d244c8624b4f644ed24e454f41e652:/src/common/custom-theme.ts diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index 169358dc..23fc1fb8 100644 --- a/src/common/custom-theme.ts +++ b/src/common/custom-theme.ts @@ -4,10 +4,11 @@ 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 cyan from '@material-ui/core/colors/cyan'; import grey from '@material-ui/core/colors/grey'; import green from '@material-ui/core/colors/green'; +import lightGreen from '@material-ui/core/colors/lightGreen'; import yellow from '@material-ui/core/colors/yellow'; import red from '@material-ui/core/colors/red'; import teal from '@material-ui/core/colors/teal'; @@ -23,20 +24,29 @@ export interface ArvadosTheme extends Theme { } interface Colors { + cyan100: string; + cyan200: string; + lightGreen300: string; + lightGreen400: string; green700: string; + yellow100: string; yellow700: string; + yellow900: string; + red100: string; red900: string; blue500: string; + grey300: string; + grey400: string; + grey500: string; purple: string; + orange: 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: { @@ -44,11 +54,22 @@ export const themeOptions: ArvadosThemeOptions = { }, customs: { colors: { + lightGreen300: lightGreen["300"], + lightGreen400: lightGreen["400"], + cyan100: cyan["100"], + cyan200: cyan["200"], green700: green["700"], + yellow100: yellow["100"], yellow700: yellow["700"], + yellow900: yellow["900"], + red100: red["100"], red900: red['900'], blue500: blue['500'], - purple: arvadosPurple + grey300: grey["300"], + grey400: grey["400"], + grey500: grey500, + purple: arvadosPurple, + orange: '#f0ad4e', } }, overrides: { @@ -103,6 +124,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' @@ -156,4 +199,4 @@ export const themeOptions: ArvadosThemeOptions = { }, }; -export const CustomTheme = createMuiTheme(themeOptions); \ No newline at end of file +export const CustomTheme = createMuiTheme(themeOptions);