From ca25bfb05a90ec0c195b4e964cde19a083e470f1 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 8 Jul 2021 10:12:57 +0300 Subject: [PATCH] resolved merge issues --- .../hr-request-form.component.html | 2 +- .../hr-request-form.component.ts | 6 +- .../my-team/details/details.component.html | 17 +- .../my-team/details/details.component.scss | 42 ++- .../src/app/my-team/home/home.component.html | 2 +- .../src/app/my-team/home/home.component.scss | 17 ++ .../src/app/profile/home/home.component.html | 111 +++---- .../src/app/profile/home/home.component.scss | 274 ++++++++++++++++-- Mohem/src/assets/localization/i18n.json | 2 +- 9 files changed, 369 insertions(+), 104 deletions(-) diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html index a74a5e39..cbe2e50f 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html @@ -57,7 +57,7 @@