Commit 2d954e1b authored by Gauri Amol Pande's avatar Gauri Amol Pande
Browse files

Merge branch...

Merge branch '42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation-2' into 'master'

Resolve "Add Log In button on registration Page, add extra messages for email and password validation"

Closes #42

See merge request 92khra1mst/hft_awado_app!52
parents eff23e1d 38c2b500
...@@ -53,9 +53,8 @@ ...@@ -53,9 +53,8 @@
<div <div
*ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)" *ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)"
class="alert-danger"> class="alert-danger"><ion-icon name="alert"></ion-icon>
<div *ngIf="angForm.controls['password'].errors.required"> <div *ngIf="angForm.controls['password'].errors.required">
Password is required. Password is required.
</div> </div>
</div> </div>
...@@ -66,10 +65,10 @@ ...@@ -66,10 +65,10 @@
</div> </div>
<div padding> <div padding>
<ion-button [disabled]="angForm.pristine || angForm.invalid" size="large" expand="block" (click)="submitRegister()">Register</ion-button> <ion-button class=ion-button-register [disabled]="angForm.pristine || angForm.invalid" size="large" expand="block" (click)="submitRegister()">Register</ion-button>
</div> </div>
<div padding> <div padding>
<ion-button size="large" expand="block" (click)="login()">Login</ion-button> <ion-button class=ion-button-login size="medium" expand="block" (click)="login()">Login</ion-button>
</div> </div>
</ion-col> </ion-col>
</ion-row> </ion-row>
......
...@@ -9,3 +9,11 @@ ...@@ -9,3 +9,11 @@
.ion-text{ .ion-text{
text-align: center; text-align: center;
} }
.ion-button-login{
width: 33%;
margin-left: 32%;
}
.ion-button-register{
width: 44%;
margin-left: 26%;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment