Skip to content

Commit 95220e2

Browse files
Merge pull request #2674 from shubhamkumar9199/feature/update-css-login-page--
WEB-318 - Feature/update css login page
2 parents 0a6825f + a60998f commit 95220e2

File tree

4 files changed

+72
-26
lines changed

4 files changed

+72
-26
lines changed

src/app/login/login-form/login-form.component.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@
3333
</mat-error>
3434
</mat-form-field>
3535

36-
<mat-checkbox *ngIf="enableRememberMe" formControlName="remember" class="m-t-10 flex-align-center">{{
37-
'labels.inputs.Remember me' | translate
38-
}}</mat-checkbox>
39-
4036
<mat-progress-bar *ngIf="loading" mode="indeterminate"></mat-progress-bar>
4137

42-
<button mat-raised-button color="primary" class="login-button flex-align-center" [disabled]="!loginForm.valid">
38+
<button
39+
mat-raised-button
40+
color="primary"
41+
class="login-button-first flex-align-center"
42+
[disabled]="!loginForm.valid"
43+
>
4344
{{ 'labels.buttons.Login' | translate }}
4445
<mat-spinner [diameter]="20" *ngIf="loading"></mat-spinner>
4546
</button>

src/app/login/login-form/login-form.component.scss

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
#login-form {
22
.login-input {
33
width: 14rem;
4-
margin-bottom: 0.6rem;
4+
margin-bottom: 0.1rem;
55
}
66

7-
.login-button {
7+
[matPrefix] fa-icon {
8+
font-size: 16px;
9+
position: absolute;
10+
top: 50%;
11+
left: 190px;
12+
transform: translateY(-50%);
13+
}
14+
15+
.login-button-first {
816
width: 14rem;
9-
margin-top: 1rem;
17+
margin-top: 0.8rem;
18+
background-color: #1976d2;
19+
color: white;
20+
border-radius: 8px;
21+
margin-bottom: 0.5rem;
1022
}
1123

1224
mat-spinner {
@@ -22,4 +34,6 @@
2234
.container-margin {
2335
margin-top: 8rem;
2436
margin-bottom: 8rem;
37+
border-radius: 50px;
38+
border: solid 1px black;
2539
}

src/app/login/login.component.html

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,26 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate }}</h1>
5151
<img src="assets/images/mifos_lg-logo.png" alt="{{ 'APP_NAME' | translate }} Logo" class="img-container" />
5252
</div>
5353

54-
<!-- Tenant Identifier Name -->
55-
<mifosx-tenant-selector *ngIf="displayTenantSelector()"></mifosx-tenant-selector>
54+
<!-- Form Section -->
55+
<div class="layout-column align-center-center">
56+
<!-- Tenant Identifier Name -->
57+
<mifosx-tenant-selector *ngIf="displayTenantSelector()"></mifosx-tenant-selector>
5658

57-
<!--
58-
Type of Form:
59-
Login
60-
Reset Password
61-
Two Factor Authentication
62-
Forgot Password (TODO: Decision to be taken on providing this feature.)
63-
-->
64-
<mifosx-login-form *ngIf="!resetPassword && !twoFactorAuthenticationRequired"></mifosx-login-form>
59+
<!--
60+
Type of Form:
61+
Login
62+
Reset Password
63+
Two Factor Authentication
64+
Forgot Password (TODO: Decision to be taken on providing this feature.)
65+
-->
66+
<mifosx-login-form *ngIf="!resetPassword && !twoFactorAuthenticationRequired"></mifosx-login-form>
6567

66-
<div class="layout-row">
67-
<mifosx-reset-password *ngIf="resetPassword"></mifosx-reset-password>
68-
<mifosx-two-factor-authentication *ngIf="twoFactorAuthenticationRequired"></mifosx-two-factor-authentication>
68+
<div class="layout-row">
69+
<mifosx-reset-password *ngIf="resetPassword"></mifosx-reset-password>
70+
<mifosx-two-factor-authentication *ngIf="twoFactorAuthenticationRequired"></mifosx-two-factor-authentication>
71+
</div>
6972
</div>
73+
7074
<div class="layout-row">
7175
<!-- Contact Information/Resources (hidden on smaller screens) -->
7276
<mat-list class="information-list align-items-center custom-horizontal-list hide-lt-lg">

src/app/login/login.component.scss

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@ mifosx-server-selector {
33
width: 40%;
44
}
55

6+
.mat-mdc-form-field-infix {
7+
width: 144px !important;
8+
}
9+
10+
mifosx-tenant-selector {
11+
border-radius: 8px;
12+
width: 14rem;
13+
margin-bottom: 0.1rem;
14+
15+
::ng-deep .mat-mdc-form-field {
16+
width: 14rem;
17+
}
18+
19+
::ng-deep .mat-mdc-form-field-infix {
20+
width: 144px !important;
21+
border-radius: 8px;
22+
}
23+
24+
::ng-deep [matPrefix] fa-icon {
25+
font-size: 16px;
26+
position: absolute;
27+
left: 190px;
28+
border-radius: 8px;
29+
top: 50%;
30+
transform: translateY(-50%);
31+
}
32+
}
33+
634
.cover {
735
background: url('../../assets/images/cover_image_resized.webp') no-repeat center center;
836
background-size: cover;
@@ -60,9 +88,12 @@ mifosx-server-selector {
6088
height: 100vh;
6189
width: 100%;
6290
min-width: 21.5rem;
91+
padding: 0.5rem 1rem;
6392

6493
.img-container {
6594
max-width: 18rem;
95+
margin-bottom: 2rem;
96+
gap: 20px;
6697
}
6798
}
6899

@@ -77,7 +108,7 @@ mifosx-server-selector {
77108
flex-direction: row !important;
78109
justify-content: center;
79110
align-items: center;
80-
gap: 1.5rem; // space between items
111+
gap: 1.5rem;
81112

82113
mat-list-item {
83114
width: auto !important;
@@ -90,10 +121,6 @@ mifosx-server-selector {
90121
}
91122
}
92123

93-
.mat-mdc-form-field-infix {
94-
width: 144px !important;
95-
}
96-
97124
.p-t-10 {
98125
padding-top: 0;
99126
}

0 commit comments

Comments
 (0)