diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index d0c4679e..2cbae42b 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -1,12 +1,12 @@ - + - + @@ -128,9 +128,9 @@ - + diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index a24939c4..22419a06 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -10,21 +10,19 @@ header } .mohemmLogo { - max-width: 46% !important; border: 0 !important; - margin-left: 70px !important; + margin-right: 70px !important; margin-top: -24px !important; - margin-bottom: 11px; + margin-bottom: 5px; } .mohemmLogo-ar { - max-width: 46% !important; border: 0 !important; margin-right: 70px !important; margin-top: -24px !important; - margin-bottom: 11px; + margin-bottom: 5px; } .closeIcon { @@ -38,6 +36,10 @@ header top: 10px; } +hr { + border-width: 1px; +} + .menubutton { white-space: normal; @@ -77,21 +79,19 @@ header .logout { - background-color: #024d71; + background-color: #0ca2de; border: none; color: white; - // padding: 20px; text-align: center; text-decoration: none; display: inline-block; font-size: 12px; - margin-left: 120px !important; + margin-right: 95px !important; margin-top: 15px !important; margin-bottom: 20px !important; border-radius: 30px; - // width: 40px; - height: 26px; - padding: 6px 24px; + height: 30px; + padding: 0px 18px; } @@ -289,22 +289,26 @@ button.menu-item.item.item-block.item-ios { } .TxtPlace { - margin: 0; - padding: 0; - text-align: center; - font-weight: bolder; - color: black; - font-size: 16px; + font-size: 20px; + color: #000; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 90%; + margin: auto; } .TxtPlaces { + margin-top: 2px; - margin: 0; - padding: 0; - text-align: center; - font-weight: bolder; font-size: 14px; - color: darkgray; + color: #000; + font-family: 'Inter' !important; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 90%; + margin: auto; } .menuFooter { @@ -323,24 +327,12 @@ button.menu-item.item.item-block.item-ios { margin: auto; } - -// .menuFooter .CompanyImg { -// width: 100%; -// height: 100%; -// } - - .menuFooter .CompanyImg { width: 65%; height: 60%; margin-bottom: -21px; } -// .logoImg{ -// width: 120px; -// position: relative; -// } - .logoImgWithMyTeam { width: 225px; @@ -394,8 +386,8 @@ ion-thumbnail.menu-thumb { // } .profileImg { - width: 140px; - height: 140px; + width: 100px; + height: 100px; display: -webkit-inline-box; display: inline-flex; overflow: hidden; 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 ad2206df..661dd844 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -2,12 +2,11 @@ height: 25vh; } -.rowOutside{ - // margin-top: -37px; - +ion-content { + --background: #f5f5f5; } -.button-digital-id{ +.button-digital-id { --background: white !important; background: white !important; white-space: normal; @@ -22,16 +21,16 @@ } -.digital-id-en{ +.digital-id-en { color: black; position: absolute; right: 20px; width: 10%; - } +} - .digital-id-ar{ +.digital-id-ar { color: black; position: absolute; left: 20px; width: 10%; - } \ No newline at end of file +} \ 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 3ed9f510..276c0e2e 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -7,7 +7,9 @@ - + + + {{ts.trPK('login','login')}} @@ -16,13 +18,13 @@ - + - + @@ -39,16 +41,16 @@ - + + {{ts.trPK('login','login')}} + - - {{ts.trPK('login','login')}} - + + {{ts.trPK('myTeam','my-team-members')}} {{EmployeeTotal}} - - - - - - - - - - - - + 0 "> - + - diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index ce4d03cb..3a6c1b2e 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -113,7 +113,7 @@ button.actionBtn.button.button { width: 22px; height: 22px; display: inline-block; - margin: 0px 5px 0px 5px; + margin: 0px 7px 0px 7px; } .deligate { @@ -356,7 +356,7 @@ ion-card { .active-Segment { font-size: 0.3cm !important; - background: #024d71 !important; + background: #0ca2de !important; text-transform: none; --color-checked: none; border-radius: 100px; @@ -394,4 +394,13 @@ ion-card { margin: 0; white-space: nowrap; font-size: 10px; +} + +ion-item { + margin: 10px; + border-bottom: 1.5px solid #ececec; +} + +ion-item:last-child { + border: none; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index b0632dfd..8717acf1 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -1291,7 +1291,7 @@ export class WorklistMainComponent implements OnInit { showLoading(notificationList) { if (notificationList.length < 0) { return true; - } else if (notificationList === []) { + } else if (notificationList.length == 0) { return false; } else { return true; } } diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index c123d317..d49d5f04 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -130,7 +130,7 @@ ion-thumbnail.menu-thumb { } .service-ar { - font-size: 20px; + font-size: 18px; color: white; // letter-spacing: 1px; font-weight: bold; @@ -1316,19 +1316,20 @@ $actionBtnSize: 36px; letter-spacing: -0.84px; color: #2B353E; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-weight: bold; line-height: 21px; font-size: 21px; } .email { text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + margin: 10px; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; color: #A2A2A2; opacity: 1; + font-family: 'Inter' !important; } @@ -1337,8 +1338,8 @@ $actionBtnSize: 36px; letter-spacing: -0.52px; color: #A2A2A2; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - font-size: 13px; + + font-size: 16px; line-height: 0px; margin-bottom: 7px; } @@ -1349,17 +1350,19 @@ $actionBtnSize: 36px; letter-spacing: -0.64px; color: #2B353E; opacity: 1; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - font-size: 16px; + font-family: 'Inter' !important; + font-size: 14px; line-height: 19px; + top: 5px; + position: relative; } .btnTitle { text-align: center; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); - line-height: 10px; + line-height: 12px; font-size: 11px; color: #4D4D4D; + margin-top: 5px; } .Profileheader-label-text-form { @@ -1423,7 +1426,7 @@ $actionBtnSize: 36px; .header-label-text-form-ar { text-align: right; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); + font-weight: bold; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; @@ -1447,12 +1450,14 @@ $actionBtnSize: 36px; .result-label-text-form-ar { text-align: right; - font-family: var(--fontFamilyPoppins-SemiBold, inherit); line-height: 20px; font-size: 16px; letter-spacing: -0.64px; color: #2B353E; opacity: 1; + font-family: 'Inter' !important; + margin-top: 3px; + font-weight: bold; } .create-edit { diff --git a/Mohem/src/assets/font/Inter-V.ttf b/Mohem/src/assets/font/Inter-V.ttf new file mode 100644 index 00000000..be66f25d Binary files /dev/null and b/Mohem/src/assets/font/Inter-V.ttf differ diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf new file mode 100644 index 00000000..3c9947bc Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular-1.ttf differ diff --git a/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf new file mode 100644 index 00000000..6a2bacbc Binary files /dev/null and b/Mohem/src/assets/font/NotoKufiArabic-Regular.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf new file mode 100644 index 00000000..ba9166ea Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Black.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf new file mode 100644 index 00000000..632d37c5 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Bold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf new file mode 100644 index 00000000..42da3f37 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraBold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf new file mode 100644 index 00000000..9a73c08f Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-ExtraLight.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf new file mode 100644 index 00000000..9a562814 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Light.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf new file mode 100644 index 00000000..a8f68e5d Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Medium.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf new file mode 100644 index 00000000..b04620fa Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Regular.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf new file mode 100644 index 00000000..e4fe4dc7 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-SemiBold.ttf differ diff --git a/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf new file mode 100644 index 00000000..0d5c9121 Binary files /dev/null and b/Mohem/src/assets/font/notokufi/NotoKufiArabic-Thin.ttf differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index cb023a1d..f2de1217 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1,46 +1,101 @@ -// $font-family-base: "WorkSans-Regular" !default; body { - :root[dir="rtl"] { + ion-app[lang="en"] { + font-family: var(--fontFamilyBoldEN) !important; + + } + + ion-app[lang="ar"] { font-family: var(--fontFamilyIOSAR) !important; + line-height: 1.3; } - :root[dir="ltr"] { - font-family: var(--fontFamilyMediumEN) !important; +} + +ion-app[lang="en"] { + + input, + textarea, + p, + label, + div, + h1, + h2, + h3, + button, + ion-button, + ion-title, + span { + font-size: 16px; + font-family: var(--fontFamilyBoldEN) !important; } } -input, -textarea, -p, -label, -div { - font-size: 16px; +ion-app[lang="ar"] { - :root[dir="rtl"] { + + p, + label, + div, + h1, + h2, + h3, + button, + ion-button, + ion-title, + span { font-family: var(--fontFamilyIOSAR) !important; + line-height: 1.3; } +} - :root[dir="ltr"] { - font-family: var(--fontFamilyLightEN) !important; +.header-toolbar { + --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); +} + +ion-app[lang="en"] { + + .boldTxt, + p.boldTxt, + .boldTxt>label { + + font-family: var(--fontFamilyBoldEN) !important; } } -h1, -h2, -h3, -button { - :root[dir="rtl"] { +ion-app[lang="ar"] { + + .boldTxt, + p.boldTxt, + .boldTxt>label { font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + line-height: 1.3; } +} - :root[dir="ltr"] { - font-family: var(--fontFamilyMediumEN) !important; - } +ion-app[lang="en"] { + + ion-label.boldTxtNav.label.label-md, + ion-label.boldTxtNav.label.label-ios, + ion-label { + // font-weight: bold; + color: var(--dark); + + font-family: var(--fontFamilyBoldEN) !important; + } } -.header-toolbar { - --background: linear-gradient(45deg, #3ac1f1 0%, #19a163 36%, #19a163 59%, #1a586d 100%); +ion-app[lang="ar"] { + + ion-label.boldTxtNav.label.label-md, + ion-label.boldTxtNav.label.label-ios, + ion-label { + font-family: var(--fontFamilyIOSAR) !important; + font-weight: bold; + line-height: 1.3; + } + } ion-label { @@ -1392,6 +1447,8 @@ div.no-dataDiv { border-radius: 25px !important; border: 1px solid #cccccc; margin-top: 10px; + width: 98%; + margin: 10px 0; } @@ -1827,6 +1884,7 @@ ion-segment-button { .menu-label { margin-left: 5px; + margin-bottom: 7px; } ion-app[dir="rtl"] { @@ -1843,8 +1901,41 @@ ion-app[dir="rtl"] { .iconBox img { margin: 5px !important; } + .pClass { - font-size: 12px; + font-size: 11px; + } + +} + +ion-app[dir="ltr"] { + + .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-left: 15px; + } + + + + app-my-team { + .request-heading span { + margin: 0 !important; + padding: 0 !important; + } + } +} + +ion-app[dir="rtl"] { + + .slideFullWidth { + margin-right: 0px !important; } + .menu-label { + margin-right: 10px !important; + } + + + .iconBox img { + margin: 5px !important; + } } \ No newline at end of file diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index b342052c..5e721ed2 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -1,43 +1,53 @@ -@font-face { +@font-face { font-family: WorkSans-Light; src: url('../assets/font/WorkSans-Light.otf'); } + @font-face { font-family: GE_SS_TWO_MEDIUM; src: url('../assets/font/GE_SS_TWO_MEDIUM.otf'); } + @font-face { font-family: WorkSans-Medium; src: url('../assets/font/WorkSans-Medium.otf'); } + @font-face { font-family: GE_SS_Two_Light; src: url('../assets/font/GE_SS_Two_Light.otf'); } + @font-face { font-family: WorkSans-Regular; src: url('../assets/font/WorkSans-Regular.otf'); } + @font-face { font-family: GE_SS_Two_Bold; src: url('../assets/font/GE_SS_Two_Bold.otf'); } + @font-face { font-family: WorkSans-SemiBold; src: url('../assets/font/WorkSans-SemiBold.otf'); } + @font-face { font-family: GE_SS_Two_Bold; src: url('../assets/font/GE_SS_Two_Bold.otf'); } + @font-face { font-family: WorkSans-Bold; src: url('../assets/font/WorkSans-Bold.otf'); } + @font-face { font-family: Poppins-SemiBold; src: url('../assets/font/Poppins-SemiBold.ttf'); } + @font-face { font-family: Poppins-Medium; src: url('../assets/font/Poppins-Medium.ttf'); @@ -47,52 +57,81 @@ font-family: Poppins-Bold; src: url('../assets/font/Poppins/Poppins-Bold.ttf'); } + @font-face { font-family: Poppins-Medium; src: url('../assets/font/Poppins/Poppins-Medium.ttf'); } + @font-face { font-family: Poppins; src: url('../assets/font/Poppins/Poppins-Regular.ttf'); } + +@font-face { + font-family: Inter; + src: url('../assets/font/Inter-V.ttf'); +} + +@font-face { + font-family: Kufi; + src: url('../assets/font/NotoKufiArabic-Regular-1.ttf'); +} + +@font-face { + font-family: Kufi; + src: url('../assets/font/notokufi/NotoKufiArabic-Regular.ttf'); +} + +@font-face { + font-family: Kufi-Semibold; + src: url('../assets/font/notokufi/NotoKufiArabic-SemiBold.ttf'); +} + +@font-face { + font-family: Kufi-Bold; + src: url('../assets/font/notokufi/NotoKufiArabic-Bold.ttf'); +} + :root { ---ion-font-family: 'Poppins'; ---break-small: 450px; ---break-big:565px; -//$break-large: 1200px; ---fontFamilyLightEN:'Poppins'; ---ontFamilyLightAR:'GE_SS_Two_Light'; ---fontFamilyRegularEN:'Poppins'; ---fontFamilyRegularAR:'GE_SS_TWO_MEDIUM'; ---fontFamilyMediumEN:'Poppins-Regular'; ---fontFamilyMediumAR:'GE_SS_TWO_MEDIUM'; ---fontFamilyBoldEN:'Poppins-Bold'; ---fontFamilyBoldAR:'GE_SS_Two_Bold'; ---fontFamilySemiBoldEN:'Poppins-Bold'; ---fontFamilySemiBoldAR:'GE_SS_Two_Bold'; ---fontFamilyIOSAR:-apple-system, "Helvetica Neue", "Roboto", sans-serif; ---fontFamilyAndroidAR:"Roboto", "Helvetica Neue", sans-serif; - --primary: #3ac1f1; - --secondary: #19a163; - --danger: #f53d3d; + --ion-font-family: 'Inter'; + --break-small: 450px; + --break-big: 565px; + //$break-large: 1200px; + --fontFamilyLightEN: 'Inter'; + --ontFamilyLightAR: 'Kufi'; + --fontFamilyRegularEN: 'Inter'; + --fontFamilyRegularAR: 'Kufi'; + --fontFamilyMediumEN: 'Inter'; + --fontFamilyMediumAR: 'Kufi'; + --fontFamilyBoldEN: 'Inter'; + --fontFamilyBoldAR: 'Kufi'; + --fontFamilySemiBoldEN: 'Inter'; + --fontFamilySemiBoldAR: 'Kufi'; + --fontFamilyIOSAR: 'Kufi'; + --fontFamilyIOSARSEMIBOLD: 'Kufi-Semibold'; + --fontFamilyAndroidAR: 'Kufi'; + --primary: #3ac1f1; + --secondary: #19a163; + --danger: #f53d3d; --customnavy: #1a586d; - --light: #ffffff; - --dark: #000000; - --gray: #e4e5e7; + --light: #ffffff; + --dark: #000000; + --gray: #e4e5e7; --custgreen: #209a83; - --cusgray:#d9d9d9; - --darkgray:#7F8C8D; - --grayBG:#acacac; - --labelColor:#999; - --orange:#F7941D; - --green:#209B48; - --red:#BE1E2D; - --blue:#223262; - --cyanblue:#1b75bc; - --newgreen:#0ca2de; - --darkblue:#024d71; - --lightblue:#3cb9d5; - --newred:#cb3232; + --cusgray: #d9d9d9; + --darkgray: #7F8C8D; + --grayBG: #acacac; + --labelColor: #999; + --orange: #F7941D; + --green: #209B48; + --red: #BE1E2D; + --blue: #223262; + --cyanblue: #1b75bc; + --newgreen: #0ca2de; + --darkblue: #024d71; + --lightblue: #3cb9d5; + --newred: #cb3232; --fontFamilyPoppins-SemiBold: 'Poppins-SemiBold'; --fontFamilyPoppins-Medium: 'Poppins-Medium'; // $font-family-base: $fontFamilyMediumEN !default; @@ -104,7 +143,7 @@ // font-size: 1.4rem; // background-color: #fff; // } - + // ion-app.md { // font-family: "Roboto", "Helvetica Neue", sans-serif; // font-size: 1.4rem; @@ -113,43 +152,43 @@ // $text-input-md-highlight-color:--primary; // $text-input-ios-highlight-color:--primary; - + // $label-md-text-color-focused:--primary; // $label-ios-text-color-focused:--primary; - + // $alert-md-button-text-color:--primary; // $alert-ios-button-text-color:--primary; - + // $alert-md-input-border-color-focused:--primary; // $alert-ios-checkbox-background-color-on:--primary; // $alert-ios-checkbox-border-color-on:--primary; - + // $checkbox-md-icon-background-color-on:$primary; // $checkbox-ios-background-color-on:$primary; // $checkbox-md-icon-border-color-on:$primary; - + // $toggle-ios-background-color-on:$primary; // $toggle-md-active-color:$primary; - + // $radio-md-color-on:$primary; // $radio-ios-color-on:$primary; - + // $button-ios-background-color:$primary; - + // $picker-md-button-text-color:$primary; // $picker-md-option-selected-color:$primary; // $picker-ios-button-text-color:$primary; - + // $range-md-bar-active-background-color:$primary; // $range-ios-bar-active-background-color:$primary; // $text-input-ios-highlight-color:$primary; - - + + // $loading-md-spinner-color:$primary; - - + + // $text-input-highlight-color-invalid:$danger; // $text-input-ios-highlight-color-invalid:$danger; // $text-input-md-highlight-color-invalid:$danger; // $text-input-ios-show-focus-highlight: true; - } \ No newline at end of file +} \ No newline at end of file
{{ts.trPK('login','login')}}