Fix dark mode styles

This commit is contained in:
Ken Hibino 2021-01-15 12:09:55 -08:00
parent 3e72e613be
commit 3778dacca7
4 changed files with 24 additions and 12 deletions

View File

@ -63,7 +63,10 @@ const useStyles = (theme: Theme) =>
}, },
menuButton: { menuButton: {
marginRight: theme.spacing(2), marginRight: theme.spacing(2),
color: theme.palette.grey[700], color:
theme.palette.type === "dark"
? theme.palette.grey[100]
: theme.palette.grey[700],
}, },
menuButtonHidden: { menuButtonHidden: {
display: "none", display: "none",

View File

@ -33,7 +33,7 @@ const useStyles = makeStyles((theme) => ({
position: "sticky", position: "sticky",
zIndex: 1, zIndex: 1,
left: 0, left: 0,
background: theme.palette.common.white, background: theme.palette.background.paper,
}, },
modal: { modal: {
display: "flex", display: "flex",

View File

@ -129,23 +129,28 @@ const useStyles = makeStyles((theme) => ({
display: "flex", display: "flex",
width: "100%", width: "100%",
height: "100%", height: "100%",
background: theme.palette.background.paper,
}, },
heading: { heading: {
opacity: 0.7,
fontSize: "1.7rem", fontSize: "1.7rem",
fontWeight: 500, fontWeight: 500,
backgroundColor: theme.palette.background.paper,
paddingLeft: "28px", // TODO: maybe use theme.spacing(3), paddingLeft: "28px", // TODO: maybe use theme.spacing(3),
paddingTop: "28px", paddingTop: "28px",
paddingBottom: "28px", paddingBottom: "28px",
color: theme.palette.text.primary, color: theme.palette.text.primary,
}, },
tabsContainer: { tabsContainer: {
background: theme.palette.background.paper, background:
theme.palette.type === "dark"
? "#303030"
: theme.palette.background.default,
}, },
tabsRoot: { tabsRoot: {
paddingLeft: theme.spacing(2), paddingLeft: theme.spacing(2),
background: theme.palette.background.paper, background:
theme.palette.type === "dark"
? "#303030"
: theme.palette.background.default,
}, },
tabsIndicator: { tabsIndicator: {
right: "auto", right: "auto",
@ -161,12 +166,11 @@ const useStyles = makeStyles((theme) => ({
color: theme.palette.text.primary, color: theme.palette.text.primary,
}, },
tabSelected: { tabSelected: {
background: theme.palette.action.selected, background: theme.palette.background.paper,
boxShadow: theme.shadows[1], boxShadow: theme.shadows[1],
}, },
panelContainer: { panelContainer: {
padding: "24px", padding: "24px",
background: theme.palette.background.paper,
}, },
taskCount: { taskCount: {
fontSize: "2rem", fontSize: "2rem",

View File

@ -26,11 +26,17 @@ const useStyles = makeStyles((theme) => ({
}, },
formControl: { formControl: {
margin: theme.spacing(1), margin: theme.spacing(1),
minWidth: 120, display: "flex",
justifyContent: "space-between",
flexDirection: "row",
alignItems: "center",
}, },
selectEmpty: { selectEmpty: {
marginTop: theme.spacing(2), marginTop: theme.spacing(2),
}, },
select: {
width: "200px",
},
})); }));
function mapStateToProps(state: AppState) { function mapStateToProps(state: AppState) {
@ -102,15 +108,14 @@ function SettingsView(props: PropsFromRedux) {
<Grid item xs={6}> <Grid item xs={6}>
<Paper className={classes.paper} variant="outlined"> <Paper className={classes.paper} variant="outlined">
<FormControl variant="outlined" className={classes.formControl}> <FormControl variant="outlined" className={classes.formControl}>
<Typography color="textPrimary" gutterBottom> <Typography color="textPrimary">Dark Theme</Typography>
Dark theme
</Typography>
<Select <Select
labelId="theme-label" labelId="theme-label"
id="theme-selected" id="theme-selected"
value={props.themePreference} value={props.themePreference}
onChange={handleThemeChange} onChange={handleThemeChange}
label="theme preference" label="theme preference"
className={classes.select}
> >
<MenuItem value={ThemePreference.SystemDefault}> <MenuItem value={ThemePreference.SystemDefault}>
System Default System Default