From f5f2fc535637ab629891552732c3981a76ed7f01 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 13 Mar 2023 11:48:39 +0300 Subject: [PATCH] fixed sprint2 issues --- .../circle-calendar/circle-calendar.component.html | 2 +- .../date-info-modal/date-info-modal.component.html | 2 +- .../src/app/vacation-rule/home/home.component.html | 2 +- .../replacement-list.component.scss | 6 ++++-- .../vacation-type/vacation-type.component.html | 6 +++--- .../vacation-type/vacation-type.component.scss | 13 +++++++++++++ 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html index 74329456..9f118d5a 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.html @@ -7,7 +7,7 @@ [dateFormatter]="calendar.dateFormatter" (onTimeSelected)="onDayClicked($event)"> -
+
{{ts.trPK('home','absence-name')}} diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index ac469fe9..0110eb3e 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -38,7 +38,7 @@ -

{{TODAYDATE.HOLIDAY_TYPE}}

+

{{TODAYDATE.LEAVE_DESCRIPTION}}

{{ts.trPK('attendance-tracking','shift-time')}}

diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index ba2b4758..04d8002a 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -79,7 +79,7 @@ {{notBadge}} -

{{item.RULE_STATUS}}


+

{{item.RULE_STATUS}}


{{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}


{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}

- - @@ -43,7 +43,7 @@ -

+

{{'vacation-rule, skip-step-3' | translate}}

diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss index acf7c6a2..f4d0592a 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss @@ -21,6 +21,11 @@ p.smallTip { font-size: 12px; color: #acacac; padding: 1px 6px; + margin-left: 20px; +} + +p.smallTip-ar { + margin-right: 20px; } .footer-button { @@ -90,6 +95,7 @@ color: black !important; } .stepHeaderLebal{ margin:0; + color: #024d71; } // .progcontainer { @@ -163,6 +169,9 @@ color: black !important; // background-color: #209a83; // } +.label-Select-ar { + margin-right: 25px !important; +} .label-Select{ color: var(--dark); @@ -206,6 +215,10 @@ color: black !important; } } +.label-ar { + margin-right: 25px !important; +} + .label{ font-size: 16px; // margin-left: 15px;