Merge branch 'develop' of gitlab.com:fia72-dev/eva_lernsituation into develop

Frontend/src/components/App.js

@@ -4,12 +4,24 @@ import { BrowserRouter as Router, Route } from "react-router-dom";
 import Login from "./Login.js";
 import { Box } from "@material-ui/core";
 import Aufnahmeantrag from "./Aufnahmeantrag.js";
+import { createMuiTheme, MuiThemeProvider } from "@material-ui/core";
+import { green, yellow } from "@material-ui/core/colors";
+
+const theme = createMuiTheme({
+  palette: {
+    primary: { main: "#2e294e" },
+    grey: { main: "#595959" },
+    danger: { main: "#d90368" },
+    secondary: { main: "#eadeda" },
+    text: { main: "#ffffff" }
+  }
+});
 
 class App extends Component {
   state = {};
   render() {
     return (
-      <>
+      <MuiThemeProvider theme={theme}>
         <CssBaseline />
         <Router>
           <Box flexDirection="column" width="100%">
@@ -17,7 +29,7 @@ class App extends Component {
             <Route path="/aufnahmeantrag" component={Aufnahmeantrag} />
           </Box>
         </Router>
-      </>
+      </MuiThemeProvider>
     );
   }
 }

Frontend/src/components/Aufnahmeantrag.js

@@ -25,7 +25,7 @@ const useStyles = createStyles(theme => ({
     margin: theme.spacing(1)
   },
   form: {
-    backgroundColor: "#f5f5f5",
+    backgroundColor: "rgba(255, 255, 255, 1)",
     borderRadius: "5px",
     margin: "20px",
     padding: "20px",
@@ -39,7 +39,7 @@ const useStyles = createStyles(theme => ({
     marginLeft: "7px"
   },
   instruments: {
-    border: "1px solid lightgrey",
+    border: "1px solid #bbb",
     borderRadius: "5px",
     display: "flex",
     flexWrap: "wrap",

Frontend/src/style/index.css

@@ -4,6 +4,7 @@ body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
     "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
     sans-serif;
+  background-color: rgba(234, 222, 218, 1) !important;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
@@ -12,3 +13,7 @@ code {
   font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
     monospace;
 }
+
+html {
+  background-color: rgba(234, 222, 218, 1);
+}