projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16647-Responsible-person'
[arvados-workbench2.git]
/
src
/
common
/
custom-theme.ts
diff --git
a/src/common/custom-theme.ts
b/src/common/custom-theme.ts
index f7559eed08050876519c215745d45e447d9cb0b0..d93b37b79b9c2de27e92b2a565012711a85de68e 100644
(file)
--- a/
src/common/custom-theme.ts
+++ b/
src/common/custom-theme.ts
@@
-39,6
+39,9
@@
const grey900 = grey["900"];
const rocheBlue = '#06C';
export const themeOptions: ArvadosThemeOptions = {
const rocheBlue = '#06C';
export const themeOptions: ArvadosThemeOptions = {
+ typography: {
+ useNextVariants: true,
+ },
customs: {
colors: {
green700: green["700"],
customs: {
colors: {
green700: green["700"],
@@
-68,9
+71,11
@@
export const themeOptions: ArvadosThemeOptions = {
}
},
MuiTab: {
}
},
MuiTab: {
- selected: {
- fontWeight: 700,
- color: arvadosPurple
+ root: {
+ '&$selected': {
+ fontWeight: 700,
+ color: arvadosPurple
+ }
}
},
MuiList: {
}
},
MuiList: {
@@
-98,6
+103,28
@@
export const themeOptions: ArvadosThemeOptions = {
fontSize: '1.25rem'
}
},
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'
MuiMenuItem: {
root: {
padding: '8px 16px'
@@
-118,11
+145,11
@@
export const themeOptions: ArvadosThemeOptions = {
},
MuiFormLabel: {
root: {
},
MuiFormLabel: {
root: {
- fontSize: '0.875rem'
- },
-
focused
: {
- "&$focused:not($error)": {
- color: arvadosPurple
+ fontSize: '0.875rem'
,
+ "&$focused": {
+
"&$focused:not($error)"
: {
+ color: arvadosPurple
+ }
}
}
},
}
}
},
@@
-148,7
+175,7
@@
export const themeOptions: ArvadosThemeOptions = {
dark: teal.A400,
contrastText: '#fff'
}
dark: teal.A400,
contrastText: '#fff'
}
- }
+ }
,
};
export const CustomTheme = createMuiTheme(themeOptions);
\ No newline at end of file
};
export const CustomTheme = createMuiTheme(themeOptions);
\ No newline at end of file