Skip to content

Commit

Permalink
Merge pull request #55 from ChangePlusPlusVandy/redesign-login
Browse files Browse the repository at this point in the history
Redesigned login page
  • Loading branch information
franklinhu88 authored Nov 11, 2024
2 parents 9d4fb56 + 44643f1 commit 8243d61
Show file tree
Hide file tree
Showing 5 changed files with 208 additions and 102 deletions.
2 changes: 2 additions & 0 deletions src/components/Button/Button.definitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export enum ButtonVariant {
Compact = "Compact",
Regular = "Regular",
Large = "Large",
Login = "Login",
Signup = "Signup",
}

export enum ButtonColor {
Expand Down
39 changes: 39 additions & 0 deletions src/components/Button/Button.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,23 @@
font-size: 1.625rem;
}

.Login {
width: 180px;
height: 46px;
border-radius: 40px;
font-size: 1rem;
font-weight: 600;
background-color: var(--miracle-color-blue);
color: white;
display: flex;
align-items: center;
justify-content: center;
}

.Login:hover {
background-color: var(--miracle-color-blue-dark);
}

.Blue {
background-color: var(--miracle-color-blue);
color: white;
Expand Down Expand Up @@ -102,3 +119,25 @@
justify-content: center;
padding-left: 0.625rem;
}

.Signup {
width: 180px;
height: 46px;
border-radius: 40px;
border: 1px solid #7196d0;
background: #ffffff;
opacity: 1;
display: flex;
align-items: center;
justify-content: center;
font-size: 16px;
font-weight: 700;
color: #7196d0;
cursor: pointer;
gap: 0px;
margin-top: 16px;
}

.Signup:hover {
opacity: 0.9;
}
19 changes: 13 additions & 6 deletions src/components/Input/Input.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,37 @@
}

.form-field input {
max-width: 100%;
width: 264px;
height: 53px;
padding: 0.625rem;
border: 0.0625rem solid var(--miracle-color-medium);
font-size: 1rem;
border: 0.8px solid var(--miracle-color-medium);
transition: 0.2s ease-in-out;
font-family: "Inter", sans-serif;
border-radius: 5px;
box-sizing: border-box;
padding-right: 2rem;
font-family: Inter;
}

.form-field input:focus {
outline: none;
border: 0.0625rem solid var(--miracle-color-red-extra-dark);
border: 0.8px solid var(--miracle-color-red-extra-dark);
transition: var(--transition-duration-short) ease-in-out;
}

.form-field input:hover {
outline: none;
border: 0.0625rem solid var(--miracle-color-red-extra-dark);
border: 0.8px solid var(--miracle-color-red-extra-dark);
transition: var(--transition-duration-short) ease-in-out;
}

.form-field input::placeholder {
font-family: "Inter", sans-serif;
font-size: 1rem;
font-size: 15px;
font-weight: 400;
text-align: left;
color: #7c7b7c;
opacity: 80%;
}

.label-and-error {
Expand Down
97 changes: 75 additions & 22 deletions src/pages/LoginPage/LoginPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,32 @@
height: 100vh;
}

.navbar {
width: 100%;
background-color: white;
padding: 16px 32px;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1);
display: flex;
align-items: center;
z-index: 10;
}

.contentContainer {
width: 100%;
background: linear-gradient(
to bottom,
var(--miracle-color-blue),
var(--miracle-color-blue-light)
);
display: flex;
justify-content: flex-start;
align-items: center;
padding: 19px;
height: auto;
flex-grow: 1;
justify-content: space-between;
}

.logo {
align-self: flex-start; /* Align the logo to the top left */
height: 50px;
Expand All @@ -16,26 +42,33 @@

.loginContainer {
display: flex;
justify-content: center;
justify-content: flex-start;
align-items: center;
margin: 72px 0;
padding-left: 19px;
width: 70%;
}

.loginBlock {
background-color: var(--miracle-color-white);
box-shadow: var(--box-shadow);
padding: 20px;
width: 300px;
border-radius: 8px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 999px;
height: 676px;
top: 127px;
left: 19px;
border-radius: 15px;
max-height: 90vh;
}

.loginBlockHeader {
font-size: 24px;
font-weight: 400;
margin-bottom: 8px;
color: #333;
font-size: 35px;
font-weight: 700;
color: black;
text-align: center;
margin-bottom: 32px;
}

.loginBlockSubtitle {
Expand All @@ -48,22 +81,18 @@
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}

.loginInputContainerUpper,
.loginInputContainerLower {
width: 100%;
.loginInputContainerUpper {
width: 264px;
margin-bottom: 16px;
justify-content: center;
}

.loginInput {
padding: 8px;
font-size: 14px;
border: 1px solid var(--miracle-color-medium-light);
border-radius: 4px;
width: 100%;
box-sizing: border-box;
margin-bottom: 8px;
.loginInputContainerLower {
width: 264px;
justify-content: center;
}

.loginBlockLink {
Expand All @@ -87,12 +116,36 @@
}

.Icon {
margin: -30px 10px 0 auto;
margin: -35px 10px 0 auto;
}

.forgotPassword {
font-size: 12px;
color: var(--miracle-color-medium-dark);
margin-top: 8px;
align-self: flex-start;
margin-left: 0;
margin-bottom: 32px;
}

.rightSideContent {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
color: white;
padding-right: 4rem;
padding-left: 1rem;
}

.rightSideHeader {
font-size: 55px;
font-weight: 700;
margin-bottom: 16px;
margin-left: auto;
}

.rightSideText {
font-size: 20px;
margin-bottom: 24px;
font-weight: 300;
}
Loading

0 comments on commit 8243d61

Please sign in to comment.