diff --git a/redaktions-app/src/components/CustomAppBar.tsx b/redaktions-app/src/components/CustomAppBar.tsx index 82cc1b8..ae9ca7b 100644 --- a/redaktions-app/src/components/CustomAppBar.tsx +++ b/redaktions-app/src/components/CustomAppBar.tsx @@ -6,13 +6,12 @@ import { Toolbar, Typography, } from "@material-ui/core"; -import { makeStyles, Theme, ThemeProvider } from "@material-ui/core/styles"; +import { makeStyles, Theme } from "@material-ui/core/styles"; import { ProfileMenu } from "./ProfileMenu"; import { mainMenuOpen, mainMenuWidth } from "./MainMenu"; import MenuIcon from "@material-ui/icons/Menu"; import { useReactiveVar } from "@apollo/client"; import clsx from "clsx"; -import theme from "./MUITheme"; const useStyles = makeStyles((theme: Theme) => createStyles({ @@ -47,30 +46,28 @@ function CustomAppBar(): React.ReactElement { const open = useReactiveVar(mainMenuOpen); return ( - - - - mainMenuOpen(true)} - > - - - - Candymat - - - - - + + + mainMenuOpen(true)} + > + + + + Candymat + + + + ); } diff --git a/redaktions-app/src/components/MUITheme.tsx b/redaktions-app/src/components/MUITheme.tsx deleted file mode 100644 index 3dd31d9..0000000 --- a/redaktions-app/src/components/MUITheme.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { createMuiTheme } from "@material-ui/core/styles"; - -const theme = createMuiTheme({ - palette: { - primary: { - main: "#59ae2e", - }, - secondary: { - main: "#e6007e", - }, - }, -}); - -export default theme; diff --git a/redaktions-app/src/index.tsx b/redaktions-app/src/index.tsx index 3ddff26..5bd223f 100644 --- a/redaktions-app/src/index.tsx +++ b/redaktions-app/src/index.tsx @@ -7,13 +7,27 @@ import { ApolloProvider } from "@apollo/client"; import { client } from "./backend/helper"; import { BrowserRouter as Router } from "react-router-dom"; import { SnackbarProvider } from "notistack"; +import { createMuiTheme, ThemeProvider } from "@material-ui/core/styles"; + +const theme = createMuiTheme({ + palette: { + primary: { + main: "#59ae2e", + }, + secondary: { + main: "#e6007e", + }, + }, +}); ReactDOM.render( - - - + + + + + , document.getElementById("root")