diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 6cea7f80..7940a32b 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,10 +27,10 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/'; // public static host = 'http://riyt-mohemm1:1010/' //MOE inside - public static host = 'http://riyt-mohemm1.mopm.gov.sa:1010/' // MOE vpn + // public static host = 'http://riyt-mohemm1.mopm.gov.sa:1010/' // MOE vpn // public static host = 'http://mohemm-app-test.srca.org.sa:1010/' // SRCA // public static host = 'http://10.254.212.41:1010/' // public static host = 'http://riyz-mohemm1.mopm.gov.sa:1010/' @@ -38,8 +38,8 @@ export class ConnectorService { - - + + constructor(public httpClient: HttpClient, public cs: CommonService, private events: Events, 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..69605043 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"] { - font-family: var(--fontFamilyIOSAR) !important; + + p, + label, + div, + h1, + h2, + h3, + button, + ion-button, + ion-title, + span { + font-family: var(--fontFamilyIOSARSEMIBOLD) !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 { @@ -1843,8 +1898,41 @@ ion-app[dir="rtl"] { .iconBox img { margin: 5px !important; } + .pClass { font-size: 12px; } +} + +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