diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index 8813731..38e4ae3 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -76,7 +76,7 @@ -
+
@@ -98,7 +98,7 @@
- WrecnhBoard + WrenchBoard No Pending You have 0 pending suggestions diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts index f135f06..a798004 100644 --- a/src/app/pages/family/family.page.ts +++ b/src/app/pages/family/family.page.ts @@ -43,6 +43,9 @@ export class FamilyPage implements OnInit { onEnroll() { this.router.navigate(['enroll']); } + jobActive(item){ + this.router.navigate(['jobactive'],{state: item}); + } familyMemebr(item){ var famItem = {jobManagerActiveData: this.jobManagerActiveData, familyPendingData:this.familyPendingData, diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html index f7637e9..b525631 100644 --- a/src/app/pages/familymember/familymember.page.html +++ b/src/app/pages/familymember/familymember.page.html @@ -57,7 +57,7 @@
-
+
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts index 6a2d9d0..bb98d32 100644 --- a/src/app/pages/familymember/familymember.page.ts +++ b/src/app/pages/familymember/familymember.page.ts @@ -45,6 +45,9 @@ export class FamilymemberPage implements OnInit { this.navctr.back(); } + jobActive(item){ + this.router.navigate(['jobactive'],{state: item}); + } onMentor() { this.router.navigate(['mentor']); } diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.scss index bb96ebb..99c9d41 100644 --- a/src/app/pages/home/home.page.scss +++ b/src/app/pages/home/home.page.scss @@ -309,7 +309,7 @@ ion-content { .bg_text { color: var(--ion-color-primary); - background-color: #dfe1f3; + background-color: #d8d9e0; font-size: 12px; padding: 2px 5px; border-radius: 5px;