From b7e6ad0ffbb7e1c93b9034715fe4d4ecfb7dcc6d Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sat, 3 Sep 2022 17:38:11 +0300 Subject: [PATCH] fixed css issues --- .../authentication/login/login.component.scss | 2 +- .../confirm-add-eit.component.scss | 2 +- .../services/common/common.service.ts | 4 ++-- Mohem/src/app/home/home.page.ts | 20 +++++++++--------- .../app/notification/home/home.component.ts | 2 +- .../worklist-main.component.scss | 2 +- .../confirm-address.component.scss | 2 +- .../confirm-basic-details.component.scss | 2 +- Mohem/src/assets/icon/new-design/report.png | Bin 0 -> 638 bytes .../profile-icons/Phone Number Active.png | Bin 0 -> 1102 bytes .../assets/imgs/profile-icons/info-a@2x.png | Bin 1189 -> 1066 bytes .../imgs/profile-icons/main address-a@2x.png | Bin 1281 -> 1175 bytes Mohem/src/assets/localization/i18n.json | 4 ++++ Mohem/src/theme/styles.scss | 2 +- 14 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 Mohem/src/assets/icon/new-design/report.png create mode 100644 Mohem/src/assets/imgs/profile-icons/Phone Number Active.png diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index 32b3208a..9e7d9149 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -191,7 +191,7 @@ img.centerDiv { .last-circle { position: inherit; - background: #65C399 !important; + background: #91692d !important; border-radius: 50%; height: 166px; width: 140px; 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 a53d7d25..dba417f7 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 @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 5b827761..62bd7c23 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1611,7 +1611,7 @@ export class CommonService { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false, total: 0 @@ -1686,7 +1686,7 @@ export class CommonService { { data: [0, 0, 0, 0, 0, 0, 0, 0], backgroundColor: [ - '#18a169', + '#c6903e', '#3cb9d5', '#114475', '#38c9b3', diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index ad694ecb..0d7f1475 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -98,14 +98,14 @@ export class HomePage implements OnInit { icon: 'assets/icon/new-design/leave_balance.png', link: '3', show: true, + }, + { + title: this.ts.trPK('eit', 'my-reports'), + statsValue: 0, + icon: 'assets/icon/new-design/report.png', + link: '4', + show: true } - // { - // title: this.ts.trPK('absenceList', 'tickets-balance'), - // statsValue: 0, - // icon: 'assets/icon/new-design/ticket_balance.png', - // link: '4', - // show: this.isShow - // } ]; public slideOptsOne = {}; @@ -861,13 +861,13 @@ export class HomePage implements OnInit { this.common.openNotificationPage(); // tslint:disable-next-line: triple-equals } else if (link == '2') { - this.openPage(this.missingSwipeRequestObject); + // this.openPage(this.missingSwipeRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '3') { - this.openPage(this.leaveRequestObject); + // this.openPage(this.leaveRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '4') { - this.openPage(this.ticketRequestObject); + // this.openPage(this.ticketRequestObject); } } diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index d56827ab..b39655b7 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -112,7 +112,7 @@ export class HomeComponent implements OnInit { value: 0, name: 'HR', active: false, - color: '#18a169', + color: '#c6903e', key: 'HRSSA', disable: false }, 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 00918629..e766d317 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -356,7 +356,7 @@ ion-card { .active-Segment { font-size: 0.3cm !important; - background: #BE332F !important; + background: #c6903e !important; text-transform: none; --color-checked: none; border-radius: 100px; 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 a53d7d25..dba417f7 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; 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 a53d7d25..dba417f7 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 @@ -195,7 +195,7 @@ position: absolute; top: 0px; z-index: 0; - background: #30b8c6; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/assets/icon/new-design/report.png b/Mohem/src/assets/icon/new-design/report.png new file mode 100644 index 0000000000000000000000000000000000000000..5b051aca9bb8bd62931b0999e7791245542ff5f6 GIT binary patch literal 638 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 D7?mF0 diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.png index df4dce43c944f0669aba758ab58205d40d729307..541f110ecf344dfb9a26d461d8fc61f58c93c6b1 100644 GIT binary patch literal 1175 zcmV;I1Zew-P)G*;V~ znO$L^Eu!Vj(4tk1Eeax|iCh$I{K&MRoFe-mBO$}W2(!{OoZC6i?)2vQp6}i}gLgB7 zbI&=y_rLd?d)}3S=I9QW6>?ARe&Db|o0kZKs2j1-EIU&2fX$#mDsf^7PoOnQjtO$12TOW7^U{|=R31x50hBB%?a66r= z2z8`wsWd=J2+mkc)p1tmbAG^_I4QvCeV6=@?QB(rr|kA}&pNRmQ-GN)ZT^-$uwwHb z$SWvK@%$Qo2SdF#VfgiZRYp9V{x7uwsH>hgzX*zIPs5`84UP~KqeJkf^(>4H_e+DC zRWtx~)FZg92cwWPf3a)esfnNP@>W0%@}G*+fRU?mbMSHf~XNL%7W+H*y1?8>Ky%q3T>@ZA>ezpy4 zovQ+f^`@QaB*^yTH(>sfRVg4@1*ax|!jnsTTJ=q0By4vAt{R|etbc7S59ZK>0}`Y)hs3(N|FR7$u<=YsW|VzWzNZUFVey>u9YMdfD|g&>6eWKgO8gHg_VYpBpPK#1hFQIQ*a&i$d@QH%7t2h*wr~Z z$hWNx@a_FWCGm{ORH${1I&-AL>Qk_~e1iR zUOTa~sl(3Zc2)xEI&pgK6#jJHPjp$VcCIh(!T^{u$NOuaUM(jI|C6ia(;f0d7WyLOJ^%qwYV&ph^qu>hBdk%m{*5t)Xe)Px#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91C!hlW z1ONa40RR91CjbBd03H0`k^le%cS%G+R9FeUSWRdXK@@(Irv8A{s-V;gjkJaKWUNqo z(iBt_4~<^DD7K&;1ksy39Rq!wA_`coD zIy>1-cGB1f$;`Z;dEdU7_jYy!l}Sy#!(D8eB0&i~*zpB&sCu{h6qCk-#PT?kD0o(Z|ZEs1t|jG0;r5 zO7=|m?4J(PQT&+dgtfeUm#TB(Z6$!g2j;{6Z^D)0>L%kc$lQv!X4I56j)TAF-;4xgA*tBx=EzXUjPmftIqv;$vO#5@Bel= ztN+B8cbX9_*mGFQB?X4Z=5mzx>kEPpT;t8*%N)v-Ph*J&@C*OCJ8xN0E|5jKFlxVk z)k9$5X)Lb8EGB`0q*IrCn zfz0FR#Dq@d@|Axi&_f8bbzKb&9B8N2%e?0c)cp24OGodG()g$OKzR_8-z1%QljQfD zI2)uC#zVxS0E0ciL${{HL+HMQpl*y^aDsN}!czUyZA}FcoB95e1}EM-KlF71zzZF% zI;&`3lIVhhXuSC#9V3bI5s47Bk;6NEx&U?Y**MMf5`qvVfH~B>$)~q{;IXIU69f#f zv>Z8^3Xp}ecGRu&$q*$S7=!=`o*BVC4I6#7#RgJ{bWBK@ET&}2>TBF`q4>{dKLthu z03p-KwAE#1AGq=fVTvjWqplL*Nmi3Xbu=x zj0;_@$uBlG9c<WVgfEF(aHY)-wVk8E6?RXnfG;iF=K=!z1Q(*o3DfWg1|xPgCf zSrwSYF0Y!$w&la+6aH>U>2_Y^6f+xNk(MNF-!;m--1Zgxn#Kj-a3vrXs+JPqE50k~ zHm@Q8v|w2kdgqoY`*Ub98LZ|CYq6AwSP(GSgo0BO;);O7dq#~b)nfBc9pC3=X3)GP z!NJJ6+00UZC8Fp?i+CAJ-)u$#r=H5a8K7<{McU?FjCUnoNvQl4zY|vA^cLT{_^kZ* r^(K-43?S|SmjC(KgVTi#Al=7bkRQe(psZFs00000NkvXXu0mjf)52NB diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index de8301ac..568e8924 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2071,6 +2071,10 @@ } }, "eit": { + "my-reports": { + "en": "My Reports", + "ar": "تقاريري" + }, "done-text": { "en": "Done", "ar": "تم" diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index d84600b3..a177bc15 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1840,7 +1840,7 @@ ion-app[dir="rtl"] { } .slideFullWidth .swiper-slide { - margin-right: 10px !important; + margin-right: 0px !important; } .iconBox img {