From 00a2eb881d71187de0de2e3bcf7b341f4e8b3f06 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 28 Aug 2022 11:42:42 +0300 Subject: [PATCH] changed MOE design --- .../absence-confirm.component.scss | 4 +-- .../src/app/absence/home/home.component.html | 16 +++++----- .../src/app/absence/home/home.component.scss | 20 ++++++------ Mohem/src/app/absence/home/home.component.ts | 4 +-- .../submit-absence-modal.component.scss | 4 +-- .../submit-absence.component.scss | 4 +-- .../view-attachments.component.scss | 2 +- Mohem/src/app/app.component.html | 8 +++-- Mohem/src/app/app.component.scss | 12 +++---- .../monthly-attendance.component.html | 4 +-- .../monthly-attendance.component.scss | 10 +++--- .../monthly-attendance.component.ts | 4 +-- .../authentication/login/login.component.scss | 6 ++-- .../app/eit/add-cei/add-cei.component.scss | 4 +-- .../app/eit/add-eit/add-eit.component.scss | 4 +-- .../cei-homepage/cei-homepage.component.html | 2 +- .../app/eit/cei-list/cei-list.component.html | 2 +- .../app/eit/cei-list/cei-list.component.scss | 20 ++++++------ .../confirm-add-cei.component.scss | 4 +-- .../confirm-add-eit.component.scss | 4 +-- .../app/eit/eit-list/eit-list.component.html | 2 +- .../app/eit/eit-list/eit-list.component.scss | 18 +++++------ .../app/eit/eit-list/eit-list.component.ts | 2 +- .../eit-update-list.component.html | 2 +- .../eit-update-list.component.scss | 2 +- Mohem/src/app/eit/home/home.component.scss | 2 +- .../submit-eit-modal.component.scss | 4 +-- .../services/connector/connector.service.ts | 3 ++ .../card-calendar.component.html | 2 +- .../circle-calendar.component.scss | 8 ++--- .../date-info-modal.component.scss | 2 +- .../date-info-modal.component.ts | 2 +- .../file-uploder-profile.component.scss | 6 ++-- .../generic-header.component.scss | 2 +- .../ui/nav-buttons/nav-buttons.component.scss | 2 +- .../services-button.component.scss | 2 +- .../stats-button/stats-button.component.html | 2 +- Mohem/src/app/home/home.page.scss | 24 ++++++-------- Mohem/src/app/home/home.page.ts | 23 ++++++++------ .../hr-request-form.component.scss | 8 ++--- .../hr-request/hr-request.component.scss | 8 ++--- .../request-details.component.scss | 8 ++--- .../my-team/details/details.component.scss | 30 +++++++++--------- .../app/my-team/details/details.component.ts | 2 +- .../src/app/my-team/home/home.component.scss | 14 ++++---- Mohem/src/app/my-team/home/home.component.ts | 4 +-- .../subordinate-leave.component.scss | 2 +- .../app/notification/home/home.component.scss | 6 ++-- .../work-list-attach-view.component.scss | 2 +- .../work-list-replacement-itg.component.html | 2 +- .../work-list-replacement-itg.component.scss | 8 ++--- .../work-list-replacement-roll.component.html | 2 +- .../work-list-replacement-roll.component.scss | 8 ++--- .../worklist-main-ic.component.scss | 2 +- .../worklist-main-mr.component.scss | 4 +-- .../worklist-main-po.component.scss | 4 +-- .../worklist-main-pr.component.scss | 2 +- .../worklist-main.component.html | 4 +-- .../worklist-main.component.scss | 2 +- .../worklist-setting.component.scss | 4 +-- .../src/app/payslip/home/home.component.scss | 18 +++++------ Mohem/src/app/payslip/home/home.component.ts | 4 +-- .../add-address/add-address.component.scss | 4 +-- .../add-basic-details.component.scss | 4 +-- .../confirm-address.component.scss | 4 +-- .../confirm-address.component.ts | 3 +- .../confirm-basic-details.component.scss | 4 +-- .../confirm-basic-details.component.ts | 3 +- .../confirm-contact.component.scss | 4 +-- .../confirm-contact.component.ts | 3 +- .../edit-profile/edit-profile.component.scss | 2 +- .../src/app/profile/home/home.component.scss | 26 +++++++-------- Mohem/src/app/profile/home/home.component.ts | 2 +- .../edit-detail-profile.component.html | 2 +- .../edit-detail-profile.component.ts | 2 +- .../performance-evaluation.component.scss | 2 +- .../performance-evaluation.component.ts | 2 +- .../profile-image.component.scss | 4 +-- .../submit-address-modal.component.scss | 4 +-- .../confirm-termination.component.scss | 4 +-- .../time-card-details.component.scss | 20 ++++++------ .../time-card-details.component.ts | 2 +- Mohem/src/assets/icon/new-design/moe-logo.png | Bin 0 -> 122472 bytes Mohem/src/assets/icon/new-design/profile.png | Bin 0 -> 3015 bytes Mohem/src/assets/localization/i18n.json | 4 +++ Mohem/src/theme/styles.scss | 10 +++--- Mohem/src/theme/variables.scss | 4 +-- 87 files changed, 262 insertions(+), 253 deletions(-) create mode 100644 Mohem/src/assets/icon/new-design/moe-logo.png create mode 100644 Mohem/src/assets/icon/new-design/profile.png diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 8cdb50a6..5e068936 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -257,7 +257,7 @@ ion-card-content.confirm-details{ } .header-toolbar-new{ - --background: #269DB8; + --background: #024d71; } .confirmEitOkButton{ @@ -266,7 +266,7 @@ ion-card-content.confirm-details{ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #269DB8; + --background: #0ca2de; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 5b60bdc0..231772fb 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -145,7 +145,7 @@
- +

@@ -154,7 +154,7 @@
- +

@@ -163,7 +163,7 @@
- +

@@ -172,7 +172,7 @@
- +

@@ -181,7 +181,7 @@
- +

@@ -190,7 +190,7 @@
- +

@@ -199,7 +199,7 @@
- +

@@ -208,7 +208,7 @@
- +

diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 0e176a32..77feaaba 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -9,7 +9,7 @@ } .addClass{ - background-color: #269DB8; + background-color: #024d71; width: 80px; height: 80px; right: 8%; @@ -47,7 +47,7 @@ margin-top: 0; margin-bottom: 0; /* border-radius: 12px !important; */ - background: #269DB8; + background: #024d71; border-bottom: 1px solid #a7a4a4; border-top: 1px solid #cac8c8; margin-left: -13px; @@ -56,13 +56,13 @@ .header-div { - background-color: #269DB8; + background-color: #024d71; text-transform: capitalize; height: 100px; } .header-toolbar-new{ - --background: #269DB8; + --background: #024d71; } @@ -223,7 +223,7 @@ margin-top: -13px; .contentEit:before { position: absolute; content: ""; - // background: #269DB8; + // background: #024d71; height: 140px; width: 100%; left: 0; @@ -266,7 +266,7 @@ margin-top: -13px; // bottom: 146px; // color: black; // background-color: #CB3232; -// // background-color: #269DB8; +// // background-color: #024d71; // width: 11%; // height: 6px; // } @@ -380,7 +380,7 @@ max-height: 4cm; height: 12px; padding-right: -10px; border-radius: 100%; - background-color: #269DB8; + background-color: #024d71; // margin-top: 30px; } .span-one{ @@ -389,7 +389,7 @@ max-height: 4cm; // color: black; display: block; font-size: 12px; - color: #269DB8; + color: #024d71; margin-left: 6px; margin-top: -2px; font-weight: bold; @@ -399,7 +399,7 @@ max-height: 4cm; .span-one-ar{ display: block; font-size: 12px; - color: #269DB8; + color: #024d71; margin-right: 6px; margin-top: -2px; font-weight: bold; @@ -411,7 +411,7 @@ max-height: 4cm; // font-size: 22px; display: block; font-size: 12px; - color: #269DB8; + color: #024d71; margin-left: 6px; margin-top: -2px; font-weight: bold; diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index f76a31bf..66744aad 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -118,7 +118,7 @@ export class HomeComponent implements OnInit { backgroundColor: [ // '#1FA269', // '#CB3232',], - '#269DB8', + '#024d71', '#b60c0c',], borderWidth: 1 } @@ -276,7 +276,7 @@ export class HomeComponent implements OnInit { { data: [this.accrualNet, this.accrualUsed], backgroundColor: [ - '#269DB8', + '#024d71', '#b60c0c',], borderWidth: 1 } diff --git a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss index 5a81509a..3c6c1fac 100644 --- a/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss +++ b/Mohem/src/app/absence/submit-absence-modal/submit-absence-modal.component.scss @@ -32,7 +32,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #269DB8; + --background:: #024d71; width: 100% !important; color: white!important; border-radius: 16px !important; @@ -43,7 +43,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background:: #269DB8; + --background:: #024d71; width: 100% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss index 94ac7f71..1be1a9ae 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -5,7 +5,7 @@ } .header-toolbar-new{ - --background: #269DB8; + --background: #024d71; } .confirmEitOkButton{ @@ -14,7 +14,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #269DB8; + --background: #0ca2de; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss index 1e941e1b..555a530f 100644 --- a/Mohem/src/app/absence/view-attachments/view-attachments.component.scss +++ b/Mohem/src/app/absence/view-attachments/view-attachments.component.scss @@ -1,3 +1,3 @@ .header-toolbar-new{ - --background: #269DB8; + --background: #024d71; } \ No newline at end of file diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 88a01715..87d45f11 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -114,8 +114,9 @@
- - + + +