diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 6ef43440..0fd9b6fb 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -2,7 +2,7 @@ - + + + + + + + + + + - + @@ -258,16 +272,31 @@ --> - + - + - - - - {{companyDesc}} - + + + + + + + + + diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index ad366505..e3b07c86 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -81,9 +81,9 @@ hr { .logout { - background-color: #44A7A1; + background-color: #99B8C6; border: none; - color: white; + color: #004D71; text-align: center; text-decoration: none; display: inline-block; @@ -99,9 +99,9 @@ hr { } .logout-ar { - background-color: #44A7A1; + background-color: #99B8C6; border: none; - color: white; + color: #004D71; text-align: center; text-decoration: none; display: inline-block; @@ -293,7 +293,8 @@ button.menu-item.item.item-block.item-ios { .TxtPlace { font-size: 20px; - color: #000; + color: #004D71; + font-weight: bold; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -304,7 +305,8 @@ button.menu-item.item.item-block.item-ios { .TxtPlaces { font-size: 14px; - color: #000; + color: #004D71; + font-weight: bold; font-family: 'Inter' !important; text-overflow: ellipsis; overflow: hidden; @@ -348,7 +350,7 @@ button.menu-item.item.item-block.item-ios { .companyTxt { font-size: 12px; - color: var(--customnavy); + color: #004D71; text-align: center; font-family: 'Inter' !important; } @@ -366,7 +368,7 @@ ion-thumbnail.menu-thumb { } .profile { - color: black !important; + color: #5C6F79 !important; font-weight: bolder !important; } @@ -403,4 +405,27 @@ ion-thumbnail.menu-thumb { ion-item, .border { border-bottom: #c7c7c7 solid 1px +} + + +.footer-container { + width: 100%; + display: -webkit-box; + display: flex; + -webkit-box-align: stretch; + align-items: stretch; +} + +.footer-container .logoFotor { + margin: 20px; + float: left; + width: 100px !important; + height: 30px !important; +} + +.footer-container .moe-logo { + width: 45px; + float: right; + margin-right: 16px; + margin-top: 15px; } \ No newline at end of file diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index d0ea3dbc..bd96c5f7 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -1,6 +1,7 @@ @@ -31,9 +32,9 @@ --> - {{ts.trPK('login','verify-login-with')}} - {{ts.trPK('login','verify-fingerprint')}} - {{ts.trPK('login','verify-faceId')}} + {{ts.trPK('login','verify-login-with')}} + {{ts.trPK('login','verify-fingerprint')}} + {{ts.trPK('login','verify-faceId')}} diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss index d636c587..11a47728 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -30,4 +30,9 @@ position: absolute; left: 20px; width: 10%; +} + +.p-color { + color: #004D71; + font-weight: bold; } \ No newline at end of file diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 276c0e2e..4984d27c 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -36,8 +36,8 @@ {{ts.trPK('login','signup')}} - English - عربي + English + عربي @@ -66,8 +66,15 @@ - - + \ No newline at end of file diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index b221ec75..84256a05 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -202,11 +202,11 @@ img.centerDiv { margin: -147px 0px 0px 274px; } -.logoFotor { - width: 45px !important; - height: 45px !important; +// .logoFotor { +// width: 45px !important; +// height: 45px !important; -} +// } .welcomeText { justify-content: center; @@ -275,4 +275,37 @@ img.centerDiv { position: absolute; left: 20px; width: 10%; +} + + +.footer-container { + width: 100%; + display: -webkit-box; + display: flex; + -webkit-box-align: stretch; + align-items: stretch; +} + +.footer-container .logoFotor { + margin: 20px; + float: left; + width: 100px !important; + height: 30px !important; +} + +.footer-container .moe-logo { + width: 45px; + float: right; + margin-right: 16px; + margin-top: 15px; +} + +.border-moe-right { + border-top-right-radius: 16px; + border-bottom-right-radius: 16px; +} + +.border-moe-left { + border-top-left-radius: 16px; + border-bottom-left-radius: 16px; } \ No newline at end of file diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 0e25e79a..b38a9945 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -139,6 +139,10 @@ export class LoginComponent implements OnInit, OnDestroy { this.backClicked(); } + start() { + this.cs.startLoading(); + } + public changeLanguage(langNumber) { console.log("current lang: " + this.currentLang) console.log("click lang: " + langNumber) diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 854ab267..9ed67c7c 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -5,7 +5,7 @@ diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index dcd0ec6b..b744cbad 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -1,9 +1,14 @@ - + + + + diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html index 40d6516a..f7dfabdf 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html @@ -12,6 +12,11 @@ + + + + + diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts index 404710f4..f27ee8fd 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts @@ -13,6 +13,7 @@ import { TranslatorService } from '../../services/translator/translator.service' styleUrls: ['./generic-header.component.scss'], }) export class GenericHeaderComponent implements OnInit { + @Input() moeImage = true; @Input() userImage = ''; @Input() showImage = false; @Input() showMenu = false; 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 568db468..ac3050aa 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 @@ -36,6 +36,6 @@ text-align: center; margin-top: 10px; color: #004D71; - font-weight: 600; + font-weight: bold; letter-spacing: .6px; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index f3974bb6..9f700a25 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -7,6 +7,7 @@ max-width: 105px; height: 160px; padding: 10px; + max-height: 155px; } .iconBox { @@ -19,7 +20,7 @@ // max-width: 45%; // padding-bottom: 5px; // padding-top: 5px; - display: block; + display: inline-block; max-width: 67%; padding-bottom: 9px; padding-top: 5px; @@ -34,7 +35,7 @@ font-size: 25px; font-weight: bold; color: #004D71; - text-align: -webkit-auto; + text-align: center; display: block; } } @@ -44,13 +45,22 @@ ion-app[dir="rtl"] .titleBox { } .pClass { + // color: #004D71; + // width: 85%; + // margin-top: 5px; + // font-weight: bold; + // text-align: -webkit-auto; + // display: block; + // font-size: 15px !important; + + color: #004D71; - width: 85%; + width: 100%; margin-top: 5px; font-weight: bold; - text-align: -webkit-auto; + text-align: center; display: block; - font-size: 15px !important; + font-size: 14px !important; } .iconFab { diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 9d3787aa..b0e676b4 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -43,9 +43,10 @@ ion-title { ion-label { display: block; - color: black !important; + color: #004D71 !important; font-size: 16px; font-weight: bold; + // margin: 0px 10px 10px 10px; } .main-dashboard-container { diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index d2a76e7b..2401e872 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -103,7 +103,7 @@ {{'replacementRoll, workflow' | translate}} - {{'replacementRoll, favorite' | translate}} + {{'replacementRoll, employee-id' | translate}} {{'replacementRoll, employee-email' | translate}} {{'replacementRoll, employee-name' | translate}} diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index d49d5f04..473b569c 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1314,7 +1314,7 @@ $actionBtnSize: 36px; .name { text-align: center; letter-spacing: -0.84px; - color: #2B353E; + color: #004D71; opacity: 1; font-weight: bold; line-height: 21px; @@ -1327,7 +1327,7 @@ $actionBtnSize: 36px; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #004D71; opacity: 1; font-family: 'Inter' !important; } @@ -1336,9 +1336,9 @@ $actionBtnSize: 36px; .subTitle { text-align: center; letter-spacing: -0.52px; - color: #A2A2A2; + color: #004D71; opacity: 1; - + font-weight: bold; font-size: 16px; line-height: 0px; margin-bottom: 7px; @@ -1348,7 +1348,7 @@ $actionBtnSize: 36px; .boldText { text-align: center; letter-spacing: -0.64px; - color: #2B353E; + color: #5C6F79 !important; opacity: 1; font-family: 'Inter' !important; font-size: 14px; @@ -1371,7 +1371,8 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: 12px; margin-bottom: 2px; @@ -1383,7 +1384,8 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: -3px; margin-bottom: 2px; @@ -1397,7 +1399,8 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 13px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #5C6F79; + font-weight: bold; opacity: 1; } @@ -1407,7 +1410,8 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; } @@ -1418,7 +1422,8 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: 12px; margin-bottom: 2px; @@ -1430,7 +1435,8 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; margin-top: -3px; margin-bottom: 2px; @@ -1444,7 +1450,8 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 13px; letter-spacing: -0.52px; - color: #A2A2A2; + color: #5C6F79; + font-weight: bold; opacity: 1; } @@ -1453,7 +1460,8 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #2B353E; + color: #004D71; + font-weight: bold; opacity: 1; font-family: 'Inter' !important; margin-top: 3px; diff --git a/Mohem/src/assets/icon/moe-logo.png b/Mohem/src/assets/icon/moe-logo.png new file mode 100644 index 00000000..da66b11e Binary files /dev/null and b/Mohem/src/assets/icon/moe-logo.png differ diff --git a/Mohem/src/assets/icon/moving.gif b/Mohem/src/assets/icon/moving.gif index ffefdb00..531de7e8 100644 Binary files a/Mohem/src/assets/icon/moving.gif and b/Mohem/src/assets/icon/moving.gif differ diff --git a/Mohem/src/assets/icon/new-design/leave_balance.png b/Mohem/src/assets/icon/new-design/leave_balance.png index c915cc7e..2cda716b 100644 Binary files a/Mohem/src/assets/icon/new-design/leave_balance.png and b/Mohem/src/assets/icon/new-design/leave_balance.png differ diff --git a/Mohem/src/assets/icon/new-design/ticket_balance.png b/Mohem/src/assets/icon/new-design/ticket_balance.png index f769f41c..a999a076 100644 Binary files a/Mohem/src/assets/icon/new-design/ticket_balance.png and b/Mohem/src/assets/icon/new-design/ticket_balance.png differ diff --git a/Mohem/src/assets/icon/new-design/work_list.png b/Mohem/src/assets/icon/new-design/work_list.png index 6b7b2dd6..cc256591 100644 Binary files a/Mohem/src/assets/icon/new-design/work_list.png and b/Mohem/src/assets/icon/new-design/work_list.png differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 390eec87..391f7ead 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -148,7 +148,7 @@ ion-label { .loading-gif { background: transparent !important; width: 100px; - height: 100px; + height: 120px; } #custom-progress-loader .container {
{{companyDesc}}
{{ts.trPK('login','verify-login-with')}}
{{ts.trPK('login','verify-fingerprint')}}
{{ts.trPK('login','verify-faceId')}}
{{'replacementRoll, workflow' | translate}}
{{'replacementRoll, favorite' | translate}}
{{'replacementRoll, employee-id' | translate}}
{{'replacementRoll, employee-email' | translate}}
{{'replacementRoll, employee-name' | translate}}