From 55f03d997140b8733b5243ce96dc346e40b5d488 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 18 Sep 2022 17:26:38 +0300 Subject: [PATCH] MOE design updates --- Mohem/src/app/app.component.scss | 4 ++-- .../src/app/authentication/login/login.component.scss | 6 +++--- .../services/connector/connector.service.ts | 4 ++-- Mohem/src/app/home/home.page.scss | 2 +- Mohem/src/app/my-team/home/home.component.scss | 4 ++-- Mohem/src/app/notification/home/home.component.scss | 2 +- .../worklist-main/worklist-main.component.scss | 2 +- Mohem/src/app/payslip/home/home.component.scss | 11 +++-------- Mohem/src/app/profile/home/home.component.html | 2 +- Mohem/src/theme/styles.scss | 4 ++++ Mohem/src/theme/variables.scss | 6 +++--- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 346052d2..3c384c1b 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -91,7 +91,7 @@ hr { margin-top: 15px !important; margin-bottom: 20px !important; border-radius: 30px; - height: 32px; + height: 35px; margin: auto; padding: 0px 24px; display: block; @@ -110,7 +110,7 @@ hr { margin-top: 15px !important; margin-bottom: 20px !important; border-radius: 30px; - height: 32px; + height: 35px; padding: 0px 24px; } diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index ee78759f..b221ec75 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -174,7 +174,7 @@ img.centerDiv { } .first-circle { - background: #024d71 !important; + background: #024D71 !important; border-radius: 50%; height: 310px; width: 310px; @@ -186,7 +186,7 @@ img.centerDiv { .middle-circle { position: relative; - background: #387c84 !important; + background: #44A7A1 !important; border-radius: 50%; height: 160px; width: 190px; @@ -195,7 +195,7 @@ img.centerDiv { .last-circle { position: inherit; - background: #15b6df !important; + background: #D5E2E8 !important; border-radius: 50%; height: 166px; width: 140px; 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 14067482..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,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - // public static host = 'https://uat.hmgwebservices.com/'; - public static host = 'https://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://mohemm-app-test.srca.org.sa:1010/' // SRCA diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 43769f1e..e2635cb2 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -75,7 +75,7 @@ ion-label { .attendance-module { border-radius: 20px; - background-color: #387c84; + background-color: #44A7A1; padding: 10px; color: white; width: 100%; diff --git a/Mohem/src/app/my-team/home/home.component.scss b/Mohem/src/app/my-team/home/home.component.scss index 8b121fc3..5de7161f 100644 --- a/Mohem/src/app/my-team/home/home.component.scss +++ b/Mohem/src/app/my-team/home/home.component.scss @@ -327,7 +327,7 @@ ion-content { width: 25px; height: 25px; border-radius: 100%; - background-color: #0ca2de; + background-color: #44A7A1; z-index: 9; margin-top: 25px; /* padding-left: 4px; */ @@ -343,7 +343,7 @@ ion-content { width: 25px; height: 25px; border-radius: 100%; - background-color: #0ca2de; + background-color: #44A7A1; z-index: 9; margin-top: 25px; text-align: center; diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 3dafab10..5a128862 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -429,7 +429,7 @@ ion-content { border-radius: 50%; width: 15px; height: 15px; - background-color: #0ca2de; + background-color: #004D71; top: 1px; } 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 3a6c1b2e..f904568a 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: #0ca2de !important; + background: #44A7A1 !important; text-transform: none; --color-checked: none; border-radius: 100px; diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index aaddce02..ec619af6 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -388,23 +388,18 @@ left: 83%; bottom: 117px; color: black; - background-color: #024d71; + background-color: #43A6A0; width: 16%; height: 6px; } .div-green-ar { - // position: relative; - // left: 77%; - // bottom: 117px; - // color: black; - // background-color: #024d71; - // width: 20%; height: 6px; + position: relative; left: 4%; bottom: 117px; color: black; - background-color: #024d71; + background-color: #43A6A0; width: 15%; height: 6px; } diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 6401003d..3e1bc718 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -70,7 +70,7 @@
+ style="background: #44A7A1; border-radius: 0px 0px 10px 10px;">