From 2e682800741a0b7e2f4b08d58c00b9b19bae2b1e Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 28 Sep 2022 17:06:17 +0300 Subject: [PATCH] fixed moe css issues --- .../absence/absence-confirm/absence-confirm.component.scss | 2 +- .../app/absence/absence-confirm/absence-confirm.component.ts | 2 +- .../app/absence/submit-absence/submit-absence.component.scss | 3 ++- Mohem/src/app/app.component.scss | 4 ++-- Mohem/src/app/eit/add-eit/add-eit.component.scss | 3 ++- .../app/eit/confirm-add-cei/confirm-add-cei.component.scss | 2 +- .../app/eit/confirm-add-eit/confirm-add-eit.component.scss | 5 +++-- .../ui/services-button/services-button.component.scss | 2 +- Mohem/src/app/home/home.page.scss | 2 +- .../worklist-advanced-search.component.scss | 2 +- Mohem/src/app/profile/add-address/add-address.component.scss | 3 ++- .../add-basic-details/add-basic-details.component.scss | 3 ++- .../profile/confirm-address/confirm-address.component.scss | 5 +++-- .../confirm-basic-details.component.scss | 5 +++-- .../profile/confirm-contact/confirm-contact.component.scss | 2 +- .../edit-detail-profile/edit-detail-profile.component.html | 2 +- .../confirm-termination/confirm-termination.component.scss | 2 +- Mohem/src/theme/styles.scss | 5 ++++- 18 files changed, 32 insertions(+), 22 deletions(-) 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 5e068936..037c2146 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -219,7 +219,7 @@ ion-card-content.confirm-details{ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts index 40dc3dd3..91c5c664 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts @@ -25,7 +25,7 @@ export class AbsenceConfirmComponent implements OnInit { direction: string; P_TransactionID: number; approversList = []; - selEmp: string = ''; + selEmp: any = ''; respID: number; absComments: string = ''; selMenu: MenuResponse; 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 1be1a9ae..577d25ec 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.scss +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.scss @@ -14,10 +14,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - --background: #0ca2de; + --background: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 3c384c1b..ad366505 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -81,7 +81,7 @@ hr { .logout { - background-color: #0ca2de; + background-color: #44A7A1; border: none; color: white; text-align: center; @@ -99,7 +99,7 @@ hr { } .logout-ar { - background-color: #024d71; + background-color: #44A7A1; border: none; color: white; text-align: center; diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.scss b/Mohem/src/app/eit/add-eit/add-eit.component.scss index 5a46fbe6..adfa7049 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.scss +++ b/Mohem/src/app/eit/add-eit/add-eit.component.scss @@ -33,8 +33,9 @@ ion-label { min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #0ca2de; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } \ No newline at end of file diff --git a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss index 7d762c06..965168f7 100644 --- a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss +++ b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index 6066d31c..399a6897 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -243,10 +243,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #0ca2de; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .approvalTitle-ar{ diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index fd8f586d..7fd315b3 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -32,7 +32,7 @@ .pClass { - font-size: 10px; + font-size: 8px; text-align: center; margin-top: 10px; color: black; diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 8fef56a0..9d3787aa 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -82,7 +82,7 @@ ion-label { margin-top: 25px; margin-bottom: 0px; // margin-right: 10px !important; - margin-left: 10px !important; + margin-left: 5px !important; h3 { font-size: 18px; diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index b0871071..4c6abeb8 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -48,7 +48,7 @@ } .search-button { - background: #3dcab3; + background: #44A7A1; height: 50px; text-align: center; font-family: WorkSans-Regular; diff --git a/Mohem/src/app/profile/add-address/add-address.component.scss b/Mohem/src/app/profile/add-address/add-address.component.scss index 0d377c92..b3be5eca 100644 --- a/Mohem/src/app/profile/add-address/add-address.component.scss +++ b/Mohem/src/app/profile/add-address/add-address.component.scss @@ -33,10 +33,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #024d71; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .country{ margin-top: 10px; diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss index 0bd07d14..0f7b91a2 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss @@ -33,10 +33,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #024d71; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .country{ diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss index 7d762c06..37d721c1 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -243,10 +243,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #0ca2de; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important; } .approvalTitle-ar{ diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss index 7d762c06..e128105b 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; @@ -243,10 +243,11 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #0ca2de; + background-color: #44A7A1; width: 80% !important; color: white!important; border-radius: 16px !important; + --border-radius: 16px !important } .approvalTitle-ar{ diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss index 7d762c06..965168f7 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html index 44e5f2da..806b100e 100644 --- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html @@ -34,7 +34,7 @@ - {{ts.trPK('general','next')}} + {{ts.trPK('general','next')}} diff --git a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss index 7d762c06..965168f7 100644 --- a/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss +++ b/Mohem/src/app/termination/confirm-termination/confirm-termination.component.scss @@ -189,7 +189,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #44A7A1; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index fc1dff01..390eec87 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1910,7 +1910,7 @@ ion-app[dir="rtl"] { } .pClass { - font-size: 10px; + font-size: 9px; } } @@ -1924,6 +1924,7 @@ ion-app[dir="ltr"] { .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child { margin-left: 5px !important; } + @@ -1946,6 +1947,8 @@ ion-app[dir="rtl"] { } .attendance-module { + margin-left: 0px !important; + margin-right: 10px !important; ion-button { height: 40px !important; }