Merge pull request #233 from SWE574-Fall2023-Group1/bug/232-login-and…

…-register-page Fix login register sizes & header sizes #232
SWE574-Fall2023-Group1 · Dec 7, 2023 · 1dfa554 · 1dfa554
2 parents 10521d4 + 3998aeb
commit 1dfa554
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/backend/frontend/src/components/header/header.css b/backend/frontend/src/components/header/header.css
@@ -24,9 +24,10 @@
 
   .container {
     width: 100%;
+    max-width: 100%;
     margin: 0 auto;
     text-align: center;
-    overflow-x: hidden;
+    /* overflow-x: hidden; */
   }
 
   .navbar {
@@ -35,7 +36,7 @@
     align-items: center;
     background-color: #8E8A8A;;
     padding: 1rem;
-    width: 100%;
+    max-width: 100%;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
   }
 
@@ -94,7 +95,7 @@
     justify-content: center;
   }
 
-  .custombg {
+  /* .custombg {
 
     box-sizing: border-box;
 
@@ -105,7 +106,7 @@
     background: #363636;
     border: 1px solid rgba(0, 0, 0, 0.1);
     border-radius: 2px;
-    }
+    } */
 
 
   body {

diff --git a/backend/frontend/src/components/header/header.js b/backend/frontend/src/components/header/header.js
@@ -127,7 +127,7 @@ function Header() {
                       <img
                         src={mainPhoto}
                         alt="Memories"
-                        style={{ width: "1000px", height: "auto" }}
+                        style={{ width: "1000px", height: "auto", maxWidth : "100%" }}
                       />
                     </div>
                   }

diff --git a/backend/frontend/src/pages/landing/Login.js b/backend/frontend/src/pages/landing/Login.js
@@ -55,7 +55,7 @@ function Login({ onLoginSuccess }) {
     <div className="container">
       {/* <form onSubmit={handleSubmit}> */}
       <div style={{width: '100%', height: '100%', position: 'relative'}}>
-        <div style={{width: 960, height: 1005, left: 550, top: 0, position: 'absolute', background: 'white', borderTopLeftRadius: 40, borderTopRightRadius: 40, overflow: 'hidden'}}>
+        <div style={{width: 900, height: 1005, left: 550, top: 0, position: 'absolute', background: 'white', borderTopLeftRadius: 40, borderTopRightRadius: 40, overflow: 'hidden'}}>
             <div style={{width: 339, height: 53, left: 304, top: 140, position: 'absolute', color: '#2C2A2A', fontSize: 40, fontFamily: 'Inter', fontWeight: '700', wordWrap: 'break-word'}}>Welcome</div>
                  {/* <button type="submit" className="btn btn-primary">Login</button> */}
                 <Button

diff --git a/backend/frontend/src/pages/landing/Register.js b/backend/frontend/src/pages/landing/Register.js
@@ -55,7 +55,7 @@ function Register() {
     <>
       {/* <form onSubmit={handleSubmit}> */}
       <div style={{width: '100%', height: '100%', position: 'relative'}}>
-        <div style={{width: 960, height: 1005, left: 550, top: 0, position: 'absolute', background: 'white', borderTopLeftRadius: 40, borderTopRightRadius: 40, overflow: 'hidden'}}>
+        <div style={{width: 900, height: 1005, left: 550, top: 0, position: 'absolute', background: 'white', borderTopLeftRadius: 40, borderTopRightRadius: 40, overflow: 'hidden'}}>
             <div style={{width: 339, height: 53, left: 304, top: 140, position: 'absolute', color: '#2C2A2A', fontSize: 40, fontFamily: 'Inter', fontWeight: '700', wordWrap: 'break-word'}}>Register</div>
                  {/* <button type="submit" className="btn btn-primary">Register</button> */}
                 <Button