Merge remote-tracking branch 'origin/main'

# Conflicts: # src/styles/_theme.scss
sopra-fs24-group-09 · Mar 25, 2024 · 14f912a · 14f912a
2 parents 3eee3b9 + edcb3fd
commit 14f912a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/styles/views/Login.scss b/src/styles/views/Login.scss
@@ -2,7 +2,7 @@
 
 .login {
   &.container {
-    margin-top: 2em;
+
     min-height: 300px;
     /* we include the center mixin defined in _theme.scss and save three duplicate lines :) */
     @include center;
@@ -14,15 +14,17 @@
     justify-content: center;
     width: 60%;
     max-width: 30em;
-    height: 20em;
+    height: 25em;
     font-size: 16px;
     font-weight: 300;
+    padding-top: 30px;
     padding-left: 37px;
     padding-right: 37px;
-    border-radius: 0.75em;
     background-color: $background;
     transition: opacity 0.5s ease, transform 0.5s ease;
     box-shadow: $dropShadow;
+    border-radius: 1.5em;
+    border: 20px solid $stroke;
   }
   &.field {
     display: flex;

diff --git a/src/styles/views/Register.scss b/src/styles/views/Register.scss
@@ -14,15 +14,17 @@
     justify-content: center;
     width: 60%;
     max-width: 30em;
-    height: 35em;
+    height: 25em;
     font-size: 16px;
     font-weight: 300;
+    padding-top: 30px;
     padding-left: 37px;
     padding-right: 37px;
-    border-radius: 0.75em;
     background-color: $background;
     transition: opacity 0.5s ease, transform 0.5s ease;
     box-shadow: $dropShadow;
+    border-radius: 1.5em;
+    border: 20px solid $stroke;
   }
   &.field {
     display: flex;

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "jsx": "react-jsx",
+    "jsx": "react"
     "baseUrl": "src"
   },
   "include": [