X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f6daa8a9318d5d7bec1cb173d8897cfcb9826157..6e4b23e9a99ab64e25c60a128e6beb4fa8636374:/src/common/custom-theme.ts diff --git a/src/common/custom-theme.ts b/src/common/custom-theme.ts index 0faf781d..74dee7f6 100644 --- 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'; @@ -31,12 +30,9 @@ interface Colors { } 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: { @@ -71,9 +67,11 @@ export const themeOptions: ArvadosThemeOptions = { } }, MuiTab: { - selected: { - fontWeight: 700, - color: arvadosPurple + root: { + '&$selected': { + fontWeight: 700, + color: arvadosPurple + } } }, MuiList: { @@ -101,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' @@ -121,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 + } } } },