From 1a2be628972491199e2263a8132e54a5baf5472c Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 7 Mar 2021 12:26:52 +0300 Subject: [PATCH] fixed id ui issues --- .../digital-id/digital-id.component.html | 15 ++--- .../edit-profile/edit-profile.component.html | 16 +++--- .../edit-profile/edit-profile.component.scss | 56 +++++++++++++------ Mohem/src/assets/localization/i18n.json | 4 ++ 4 files changed, 60 insertions(+), 31 deletions(-) diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.html b/Mohem/src/app/authentication/digital-id/digital-id.component.html index 6b133b8f..eb411171 100644 --- a/Mohem/src/app/authentication/digital-id/digital-id.component.html +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.html @@ -1,13 +1,14 @@ - + - - + + - -

{{userInfo.ASSIGNMENT_NUMBER}}

+ +

{{userInfo.ASSIGNMENT_NUMBER}}

@@ -17,8 +18,8 @@ - - + +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 808ce73c..32b4dd9d 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -27,17 +27,19 @@ - -
+ +
- + - + - + @@ -54,7 +56,7 @@ - + @@ -71,7 +73,7 @@ - + diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 24788296..5b80da30 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -1,11 +1,19 @@ .list-ios { + // margin-left: 0; + // margin-right: 0; + // margin-top: 32px; + // margin-bottom: 32px; + // background: var(--ion-item-background,var(--ion-background-color,#fff)); margin-left: 0; margin-right: 0; - margin-top: 32px; + margin-top: -15px; margin-bottom: 32px; - background: var(--ion-item-background,var(--ion-background-color,#fff)); + border: 1px solid #d8d8d8; + background: var(--ion-item-background, var(--ion-background-color, #fff)); + border-radius: 10px; + padding-top: 60px; } .header-toolbar-new{ @@ -76,33 +84,38 @@ } - .gridService{ - - // background-color: #269DB8; + .gridService-en{ margin-top: 87px; border-radius: 10px; margin-bottom: -49px; margin-left: 30px; margin-right: 30px; - } + .gridService-ar{ + margin-top: 87px; + border-radius: 10px; + margin-bottom: -49px; + margin-left: 20px; + margin-right: 25px; + } + .columns{ - margin: 10px; - background: #0B4775; - border-radius: 27px; + // margin: 10px; + // background: #0B4775; + // border-radius: 27px; // padding-left: 30px; // padding-right: 6px; // padding-top: 19px; // padding-bottom: 26px; } .columns-ar{ - margin: 10px; - background: #0B4775; - border-radius: 27px; - padding-left: 7px; - padding-right: 3px; - padding-top: 19px; - padding-bottom: 26px; + // margin: 10px; + // background: #0B4775; + // border-radius: 27px; + // padding-left: 7px; + // padding-right: 3px; + // padding-top: 19px; + // padding-bottom: 26px; } .service{ @@ -125,7 +138,7 @@ margin-right: 26px; } .services-ar{ - font-size: 14px; + font-size: 20px; color: white; margin-right: 25px; } @@ -191,4 +204,13 @@ background:white; margin-top: 100%; // margin-left: 10%; +} + +.service-row-en{ + width: 79%; + margin: -12px 0px 0px 35px; +} +.service-row-ar{ + width: 95%; + margin: -12px 0px 35px 0px; } \ No newline at end of file diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index e6be0cdb..8356e73a 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -942,6 +942,10 @@ "digital-id":{ "en":"Employee Digital ID", "ar":"هوية الموظف الرقمية" + }, + "appreciate-service":{ + "en":"We appreciate you for completing the service of", + "ar":"نحن نقدر لك استكمال خدمة" } }, "home": {