Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update login and register pages #2459

Merged
merged 7 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions public/images/eye-slash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/eye.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/login_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/images/social/devicon_google.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/images/social/fe_github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/social/logos_facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions public/images/social/prime_twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions resources/assets/sass/components/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
padding: 0 25px;
border-radius: 29px;
background-color: $main-color;
color: $main-color4;
color: $main-color3;
font-size: 14px;
font-weight: bold;
text-transform: uppercase;
min-height: 57px;
}
.codeweek-button input:hover,
Expand Down
21 changes: 9 additions & 12 deletions resources/assets/sass/components/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
margin-bottom: 15px;
}
.codeweek-form-field-wrapper .errors{
margin-left: 140px;
font-size: 13px;
color: red;
}
Expand Down Expand Up @@ -176,12 +175,14 @@
}

.codeweek-form-field input{
flex: 1;
height: 57px;
border: 1px solid #e8e8e8;
border-radius: 29px;
text-indent: 20px;
width: 100%;
border-radius: 24px;
border: 2px solid var(--Dark-Blue-200, #A4B8D9);
color: var(--Slate-500, #333E48);
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 30px;
font-family: Blinker;
}

.codeweek-form-field textarea {
Expand All @@ -196,9 +197,7 @@

.codeweek-form-field label{
margin-right: 10px;
text-transform: uppercase;
width: 120px;
text-align: right;
font-family: Blinker;
}

.codeweek-form-field.align-flex-start label{
Expand Down Expand Up @@ -288,8 +287,6 @@
display: flex;
justify-content: center;
width: 100%;
margin-top: 30px;
margin-bottom: 20px;
}


Expand Down
94 changes: 93 additions & 1 deletion resources/assets/sass/pages/login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,96 @@
border-right: 1px solid #ccc;
flex: 1;
}
}
}

.help-block .errorlist {
margin: 0;
}

.codeweek-content-wrapper {
display: flex;
justify-content: center;
align-items: left;
height: 100%;
padding: 80px 150px;
margin: 0 !important;
max-height: 850px;

}
.codeweek-content-wrapper-inside {
width: 760px;
padding: 64px;
flex-direction: column !important;
align-items: left;
gap: 40px;
background-color: #fff;
border-radius: 32px;
}


.reset_title {
color: var(--Dark-Blue-500, #1C4DA1);

/* Display md/Montserrat Medium */
font-family: Montserrat;
font-size: 36px;
font-style: normal;
font-weight: 500;
line-height: 44px; /* 122.222% */
letter-spacing: -0.72px;
padding-bottom: 40px;
}
.reset_description {
color: var(--Slate-500, #333E48);

/* Text xl/Blinker Regular */
font-family: Blinker;
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 30px; /* 150% */
padding-bottom: 40px;
}

.codeweek-form-field input, .codeweek-form-field-wrapper input {
padding-left: 1rem;
padding-right: 1rem;
}

#codeweek-login-page .codeweek-form-field{
flex-direction: column;
align-items: flex-start;
}

.codeweek-form-field, .codeweek-form-field-searchable {
display: flex;
justify-content: stretch;
flex: 1;
align-items: flex-start;
flex-direction: column;
align-content: flex-start;
}

@media screen and (max-width: 1080px) {
.reset_title {
color: var(--Dark-Blue-500, #1C4DA1);
font-family: Montserrat;
font-size: 30px;
font-style: normal;
font-weight: 400;
line-height: 36px;
letter-spacing: -0.72px;
display: flex;
padding-bottom: 24px;
}

.reset_description {
font-family: Blinker;
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 30px; /* 150% */
padding-bottom: 24px;
}
}

13 changes: 7 additions & 6 deletions resources/lang/en/login.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@

'email' => 'E-Mail Address',
'password' => 'Password',
'remember' => 'Remember Me',
'forgotten_password' => 'Forgot Your Password ?',
'remember' => 'Keep me signed in',
'forgotten_password' => 'Forgot Your Password',
'no_account' => 'Don\'t have an account ?',
'signup' => 'Sign Up',
'reset' => 'Reset Your Password',
'send_password' => 'Send Password Reset Link',
'send_password' => 'Reset Password',
'confirm_password' => 'Confirm Password',
'name' => 'name',

];
'name' => 'Fullname',
'resetpage_title' => 'Forgotten your password?',
'resetpage_description'=>'Confirm your email address below and we’ll send you instructions on how to create your new password',
];
Loading