Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
fbaa9506
Commit
fbaa9506
authored
Jun 15, 2020
by
Muhammad Usman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
footer label issue fixed for all screens
parent
f9fda747
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
51 additions
and
48 deletions
+51
-48
forgot-password.component.html
...r-web/auth/forgot-password/forgot-password.component.html
+3
-1
forgot-password.component.scss
...r-web/auth/forgot-password/forgot-password.component.scss
+2
-6
login.component.html
.../components/my-career-web/auth/login/login.component.html
+3
-1
login.component.scss
.../components/my-career-web/auth/login/login.component.scss
+2
-7
register.component.html
...nents/my-career-web/auth/register/register.component.html
+14
-2
register.component.scss
...nents/my-career-web/auth/register/register.component.scss
+8
-7
register.component.ts
...ponents/my-career-web/auth/register/register.component.ts
+2
-1
reset-password.component.html
...eer-web/auth/reset-password/reset-password.component.html
+3
-1
reset-password.component.scss
...eer-web/auth/reset-password/reset-password.component.scss
+2
-7
wrapper.component.scss
...ents/my-career-web/layouts/wrapper/wrapper.component.scss
+2
-1
welcome.component.html
...p/components/my-career-web/welcome/welcome.component.html
+4
-0
welcome.component.scss
...p/components/my-career-web/welcome/welcome.component.scss
+3
-8
welcome.component.ts
...app/components/my-career-web/welcome/welcome.component.ts
+3
-6
No files found.
frontend/angular/src/app/components/my-career-web/auth/forgot-password/forgot-password.component.html
View file @
fbaa9506
...
@@ -36,4 +36,6 @@
...
@@ -36,4 +36,6 @@
</div>
</div>
</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>
frontend/angular/src/app/components/my-career-web/auth/forgot-password/forgot-password.component.scss
View file @
fbaa9506
...
@@ -105,8 +105,8 @@
...
@@ -105,8 +105,8 @@
.mc-footer-label
{
.mc-footer-label
{
position
:
absolute
;
position
:
absolute
;
bottom
:
32px
;
width
:
100%
;
left
:
46%
;
bottom
:
10px
;
color
:
#808285
;
color
:
#808285
;
font-family
:
$bodyFont
;
font-family
:
$bodyFont
;
font-size
:
11px
;
font-size
:
11px
;
...
@@ -137,8 +137,4 @@
...
@@ -137,8 +137,4 @@
}
}
}
}
}
}
.mc-footer-label
{
left
:
29%
;
}
}
}
frontend/angular/src/app/components/my-career-web/auth/login/login.component.html
View file @
fbaa9506
...
@@ -45,6 +45,8 @@
...
@@ -45,6 +45,8 @@
</div>
</div>
</form>
</form>
</div>
</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>
</div>
frontend/angular/src/app/components/my-career-web/auth/login/login.component.scss
View file @
fbaa9506
...
@@ -101,8 +101,8 @@
...
@@ -101,8 +101,8 @@
.mc-footer-label
{
.mc-footer-label
{
position
:
absolute
;
position
:
absolute
;
bottom
:
-1
0%
;
width
:
10
0%
;
left
:
43%
;
bottom
:
10px
;
color
:
#808285
;
color
:
#808285
;
font-family
:
$bodyFont
;
font-family
:
$bodyFont
;
font-size
:
11px
;
font-size
:
11px
;
...
@@ -133,9 +133,4 @@
...
@@ -133,9 +133,4 @@
}
}
}
}
}
}
.mc-footer-label
{
left
:
29%
;
bottom
:
-4%
;
}
}
}
frontend/angular/src/app/components/my-career-web/auth/register/register.component.html
View file @
fbaa9506
...
@@ -23,6 +23,14 @@
...
@@ -23,6 +23,14 @@
</app-form-control>
</app-form-control>
</div>
</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"
>
<div
class=
"was-referred form-group"
>
<span>
Were you referred by another member?
</span>
<span>
Were you referred by another member?
</span>
<div
class=
"mt-sm-top"
style=
"white-space: nowrap;"
>
<div
class=
"mt-sm-top"
style=
"white-space: nowrap;"
>
...
@@ -54,7 +62,9 @@
...
@@ -54,7 +62,9 @@
<div
class=
"d-flex justify-content-center"
>
<div
class=
"d-flex justify-content-center"
>
<app-overlay
[
isActive
]="
isLoading
"
></app-overlay>
<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>
<div
class=
"signup-link"
>
<div
class=
"signup-link"
>
...
@@ -62,6 +72,8 @@
...
@@ -62,6 +72,8 @@
</div>
</div>
</form>
</form>
</div>
</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>
</div>
frontend/angular/src/app/components/my-career-web/auth/register/register.component.scss
View file @
fbaa9506
...
@@ -66,6 +66,12 @@
...
@@ -66,6 +66,12 @@
}
}
}
}
small
.text-danger
{
position
:
absolute
;
bottom
:
-15px
;
font-size
:
10px
;
}
.action-btn
{
.action-btn
{
height
:
50px
;
height
:
50px
;
width
:
260px
;
width
:
260px
;
...
@@ -127,8 +133,8 @@
...
@@ -127,8 +133,8 @@
.mc-footer-label
{
.mc-footer-label
{
position
:
absolute
;
position
:
absolute
;
bottom
:
-1
0%
;
width
:
10
0%
;
left
:
43%
;
bottom
:
10px
;
color
:
#808285
;
color
:
#808285
;
font-family
:
$bodyFont
;
font-family
:
$bodyFont
;
font-size
:
11px
;
font-size
:
11px
;
...
@@ -167,9 +173,4 @@
...
@@ -167,9 +173,4 @@
margin-top
:
15px
;
margin-top
:
15px
;
}
}
}
}
.mc-footer-label
{
left
:
29%
;
bottom
:
-6%
;
}
}
}
frontend/angular/src/app/components/my-career-web/auth/register/register.component.ts
View file @
fbaa9506
...
@@ -20,6 +20,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
...
@@ -20,6 +20,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
lastname
:
''
,
lastname
:
''
,
email
:
''
,
email
:
''
,
password
:
''
,
password
:
''
,
confirmPassword
:
''
,
ReferralCode
:
''
,
ReferralCode
:
''
,
was_referred
:
false
,
was_referred
:
false
,
terms
:
false
,
terms
:
false
,
...
@@ -44,7 +45,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
...
@@ -44,7 +45,7 @@ export class RegisterComponent extends BaseComponent implements OnInit {
}
}
register
():
void
{
register
():
void
{
if
(
this
.
form
.
invalid
)
{
if
(
this
.
form
.
invalid
||
this
.
registerForm
.
password
!==
this
.
registerForm
.
confirmPassword
)
{
return
this
.
hs
.
validateAllFormFields
(
this
.
form
);
return
this
.
hs
.
validateAllFormFields
(
this
.
form
);
}
}
this
.
registerForm
.
firstname
=
'AA'
;
this
.
registerForm
.
firstname
=
'AA'
;
...
...
frontend/angular/src/app/components/my-career-web/auth/reset-password/reset-password.component.html
View file @
fbaa9506
...
@@ -41,4 +41,6 @@
...
@@ -41,4 +41,6 @@
</div>
</div>
</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>
frontend/angular/src/app/components/my-career-web/auth/reset-password/reset-password.component.scss
View file @
fbaa9506
...
@@ -125,8 +125,8 @@
...
@@ -125,8 +125,8 @@
.mc-footer-label
{
.mc-footer-label
{
position
:
absolute
;
position
:
absolute
;
bottom
:
32px
;
width
:
100%
;
left
:
46%
;
bottom
:
10px
;
color
:
#808285
;
color
:
#808285
;
font-family
:
$bodyFont
;
font-family
:
$bodyFont
;
font-size
:
11px
;
font-size
:
11px
;
...
@@ -157,9 +157,4 @@
...
@@ -157,9 +157,4 @@
}
}
}
}
}
}
.mc-footer-label
{
left
:
29%
;
bottom
:
4%
;
}
}
}
frontend/angular/src/app/components/my-career-web/layouts/wrapper/wrapper.component.scss
View file @
fbaa9506
.my-career-app
{
.my-career-app
{
height
:
100vh
;
min-height
:
100vh
;
position
:
relative
;
}
}
frontend/angular/src/app/components/my-career-web/welcome/welcome.component.html
View file @
fbaa9506
...
@@ -14,3 +14,7 @@
...
@@ -14,3 +14,7 @@
</div>
</div>
</div>
</div>
<div
class=
"d-flex justify-content-center mc-footer-label"
>
<span>
© {{year}} Matchd | Privacy Policy
</span>
</div>
frontend/angular/src/app/components/my-career-web/welcome/welcome.component.scss
View file @
fbaa9506
...
@@ -76,10 +76,10 @@
...
@@ -76,10 +76,10 @@
.mc-footer-label
{
.mc-footer-label
{
position
:
absolute
;
position
:
absolute
;
bottom
:
-1
0%
;
width
:
10
0%
;
left
:
43%
;
bottom
:
10px
;
color
:
#808285
;
color
:
#808285
;
font-family
:
$bodyFont
,
sans-serif
;
font-family
:
$bodyFont
;
font-size
:
11px
;
font-size
:
11px
;
letter-spacing
:
0
;
letter-spacing
:
0
;
line-height
:
13px
;
line-height
:
13px
;
...
@@ -101,9 +101,4 @@
...
@@ -101,9 +101,4 @@
}
}
}
}
.mc-footer-label
{
left
:
29%
;
bottom
:
-4%
;
}
}
}
frontend/angular/src/app/components/my-career-web/welcome/welcome.component.ts
View file @
fbaa9506
import
{
Component
,
OnInit
}
from
'@angular/core'
;
import
{
Component
}
from
'@angular/core'
;
@
Component
({
@
Component
({
selector
:
'app-welcome'
,
selector
:
'app-welcome'
,
templateUrl
:
'./welcome.component.html'
,
templateUrl
:
'./welcome.component.html'
,
styleUrls
:
[
'./welcome.component.scss'
]
styleUrls
:
[
'./welcome.component.scss'
]
})
})
export
class
WelcomeComponent
implements
OnInit
{
export
class
WelcomeComponent
{
constructor
()
{
}
year
=
new
Date
().
getFullYear
();
ngOnInit
()
{
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment