hard coded the background colors in theme to keep them consistent between light and dark modes
This commit is contained in:
parent
c04b9b0adb
commit
61922f28ee
4 changed files with 41 additions and 14 deletions
|
|
@ -5,7 +5,7 @@ import HTTPProvider from 'providers/http'
|
|||
import { useState } from 'react'
|
||||
import LoadingScreen from './LoadingScreen'
|
||||
import UserWrapper from './UserWrapper'
|
||||
import { Theme, ThemeProvider } from '@mui/material'
|
||||
import { CssBaseline, Theme, ThemeProvider } from '@mui/material'
|
||||
import { CreateTheme } from '../theme/theme'
|
||||
import { getThemeType, setThemeType } from '../theme/themeType'
|
||||
|
||||
|
|
@ -40,6 +40,7 @@ function App() {
|
|||
cacheLocation='localstorage'
|
||||
>
|
||||
<ThemeProvider theme={palette}>
|
||||
<CssBaseline />
|
||||
<AuthWrapper setToken={setToken}>
|
||||
{ token ?
|
||||
<HTTPProvider token={token}>
|
||||
|
|
|
|||
|
|
@ -22,10 +22,11 @@ const useStyles = makeStyles((theme: Theme) => ({
|
|||
marginRight: theme.spacing(0.5),
|
||||
[theme.breakpoints.up("md")]: {
|
||||
marginRight: theme.spacing(1.5)
|
||||
}
|
||||
},
|
||||
color: getSignatureAccentColour() + " !important"
|
||||
},
|
||||
button: {
|
||||
color: getSignatureAccentColour()
|
||||
color: getSignatureAccentColour() + " !important"
|
||||
},
|
||||
hide: {
|
||||
display: "none"
|
||||
|
|
@ -85,6 +86,8 @@ export default function Header(props: Props) {
|
|||
const themeType = useThemeType();
|
||||
const classes = useStyles()
|
||||
|
||||
console.log(getSignatureColour())
|
||||
|
||||
return (
|
||||
<AppBar position="fixed" className={classes.appBar}>
|
||||
<Toolbar disableGutters className={classes.toolbar}>
|
||||
|
|
@ -94,7 +97,8 @@ export default function Header(props: Props) {
|
|||
color="inherit"
|
||||
aria-label="Open side menu"
|
||||
onClick={openSide}
|
||||
className={classNames(classes.button, sideIsOpen && classes.hide)}>
|
||||
style={{ color: getSignatureAccentColour() }}
|
||||
className={classes.button}>
|
||||
<Menu />
|
||||
</IconButton>
|
||||
{/* )} */}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue