Commit fbaa9506 by Muhammad Usman

footer label issue fixed for all screens

parent f9fda747
......@@ -36,4 +36,6 @@
</div>
</div>
<span class="mc-footer-label">© {{year}} Matchd | Privacy Policy</span>
<div class="d-flex justify-content-center mc-footer-label">
<span>© {{year}} Matchd | Privacy Policy</span>
</div>
......@@ -105,8 +105,8 @@
.mc-footer-label {
position: absolute;
bottom: 32px;
left: 46%;
width: 100%;
bottom: 10px;
color: #808285;
font-family: $bodyFont;
font-size: 11px;
......@@ -137,8 +137,4 @@
}
}
}
.mc-footer-label {
left: 29%;
}
}
......@@ -45,6 +45,8 @@
</div>
</form>
</div>
</div>
<span class="mc-footer-label">© {{year}} Matchd | Privacy Policy</span>
<div class="d-flex justify-content-center mc-footer-label">
<span>© {{year}} Matchd | Privacy Policy</span>
</div>
......@@ -101,8 +101,8 @@
.mc-footer-label {
position: absolute;
bottom: -10%;
left: 43%;
width: 100%;
bottom: 10px;
color: #808285;
font-family: $bodyFont;
font-size: 11px;
......@@ -133,9 +133,4 @@
}
}
}
.mc-footer-label {
left: 29%;
bottom: -4%;
}
}
......@@ -23,6 +23,14 @@
</app-form-control>
</div>
<div class="form-group position-relative">
<label>Confirm your new password</label>
<app-form-control>
<input [type]="showPassword ? 'text' : 'password'" name="confirmPassword" required class="form-control" [(ngModel)]="registerForm.confirmPassword">
</app-form-control>
<small *ngIf="form.valid && registerForm.password !== registerForm.confirmPassword" class="text-danger">Passwords do not match.</small>
</div>
<div class="was-referred form-group">
<span>Were you referred by another member?</span>
<div class="mt-sm-top" style="white-space: nowrap;">
......@@ -54,7 +62,9 @@
<div class="d-flex justify-content-center">
<app-overlay [isActive]="isLoading"></app-overlay>
<button class="action-btn" (click)="register()" [disabled]="isLoading && !registerForm.terms || !registerForm.policy">Sign up</button>
<button class="action-btn" (click)="register()" [disabled]="isLoading || !registerForm.terms || !registerForm.policy || registerForm.password !== registerForm.confirmPassword || form.invalid">
Sign up
</button>
</div>
<div class="signup-link">
......@@ -62,6 +72,8 @@
</div>
</form>
</div>
</div>
<span class="mc-footer-label">© {{year}} Matchd | Privacy Policy</span>
<div class="d-flex justify-content-center mc-footer-label">
<span>© {{year}} Matchd | Privacy Policy</span>
</div>
......@@ -66,6 +66,12 @@
}
}
small.text-danger {
position: absolute;
bottom: -15px;
font-size: 10px;
}
.action-btn {
height: 50px;
width: 260px;
......@@ -127,8 +133,8 @@
.mc-footer-label {
position: absolute;
bottom: -10%;
left: 43%;
width: 100%;
bottom: 10px;
color: #808285;
font-family: $bodyFont;
font-size: 11px;
......@@ -167,9 +173,4 @@
margin-top: 15px;
}
}
.mc-footer-label {
left: 29%;
bottom: -6%;
}
}
......@@ -20,6 +20,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
lastname: '',
email: '',
password: '',
confirmPassword: '',
ReferralCode: '',
was_referred: false,
terms: false,
......@@ -44,7 +45,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
}
register(): void {
if (this.form.invalid) {
if (this.form.invalid || this.registerForm.password !== this.registerForm.confirmPassword) {
return this.hs.validateAllFormFields(this.form);
}
this.registerForm.firstname = 'AA';
......
......@@ -41,4 +41,6 @@
</div>
</div>
<span class="mc-footer-label">© {{year}} Matchd | Privacy Policy</span>
<div class="d-flex justify-content-center mc-footer-label">
<span>© {{year}} Matchd | Privacy Policy</span>
</div>
......@@ -125,8 +125,8 @@
.mc-footer-label {
position: absolute;
bottom: 32px;
left: 46%;
width: 100%;
bottom: 10px;
color: #808285;
font-family: $bodyFont;
font-size: 11px;
......@@ -157,9 +157,4 @@
}
}
}
.mc-footer-label {
left: 29%;
bottom: 4%;
}
}
......@@ -14,3 +14,7 @@
</div>
</div>
<div class="d-flex justify-content-center mc-footer-label">
<span>© {{year}} Matchd | Privacy Policy</span>
</div>
......@@ -76,10 +76,10 @@
.mc-footer-label {
position: absolute;
bottom: -10%;
left: 43%;
width: 100%;
bottom: 10px;
color: #808285;
font-family: $bodyFont, sans-serif;
font-family: $bodyFont;
font-size: 11px;
letter-spacing: 0;
line-height: 13px;
......@@ -101,9 +101,4 @@
}
}
.mc-footer-label {
left: 29%;
bottom: -4%;
}
}
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
@Component({
selector: 'app-welcome',
templateUrl: './welcome.component.html',
styleUrls: ['./welcome.component.scss']
})
export class WelcomeComponent implements OnInit {
export class WelcomeComponent {
constructor() { }
ngOnInit() {
}
year = new Date().getFullYear();
}
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