diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 339e60ed..3f4a1c3d 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -227,7 +227,7 @@ ion-card-content.confirm-details { position: absolute; top: 0px; z-index: 0; - background: #44A7A1; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 45f06cea..5fafe25e 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -2,11 +2,11 @@ -
@@ -21,15 +21,15 @@ -
+

- + - + {{ts.trPK('userProfile','title')}} @@ -43,7 +43,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} --> - + @@ -113,38 +113,22 @@ - - - - - - - - +
+ +
-
+ -
@@ -158,15 +142,15 @@
-
+

- + - + {{ts.trPK('userProfile','title')}} @@ -180,7 +164,7 @@ {{ts.trPK('userProfile','performance-evaluation')}} --> - + @@ -272,31 +256,14 @@ --> - - - - - - - - - - - - - - + - - \ No newline at end of file diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index 1d590e9d..f50ff117 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -202,11 +202,10 @@ img.centerDiv { margin: -147px 0px 0px 274px; } -// .logoFotor { -// width: 45px !important; -// height: 45px !important; - -// } +.logoFotor { + width: 45px !important; + height: 45px !important; +} .welcomeText { justify-content: center; diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 9ed67c7c..fae64237 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -5,7 +5,6 @@ diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html index 3b0aae40..07a6f05e 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html @@ -12,11 +12,6 @@
- -
- -
-
diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts index f27ee8fd..404710f4 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts @@ -13,7 +13,6 @@ import { TranslatorService } from '../../services/translator/translator.service' styleUrls: ['./generic-header.component.scss'], }) export class GenericHeaderComponent implements OnInit { - @Input() moeImage = true; @Input() userImage = ''; @Input() showImage = false; @Input() showMenu = false; diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 28015f86..83d7c511 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -32,7 +32,7 @@ .pClass { - font-size: 8px; + font-size: 10px; text-align: center; margin-top: 10px; color: black; diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss index 82533bbc..38850bea 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss @@ -33,7 +33,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #44A7A1; + background-color: #c6903e; width: 80% !important; color: white!important; border-radius: 16px !important; 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 c9a51b15..15734c22 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -193,7 +193,7 @@ position: absolute; top: 0px; z-index: 0; - background: #44A7A1; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; @@ -247,7 +247,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #44A7A1; + background-color: #c6903e; width: 80% !important; color: white!important; border-radius: 16px !important; 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 b532a9c1..892c3492 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 @@ -193,7 +193,7 @@ position: absolute; top: 0px; z-index: 0; - background: #44A7A1; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; @@ -247,7 +247,7 @@ min-height: 45px !important; min-width: 5px !important; margin: 8px !important; - background-color: #44A7A1; + background-color: #c6903e; width: 80% !important; color: white!important; border-radius: 16px !important; diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss index 79ca3552..98f649e2 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss @@ -193,7 +193,7 @@ position: absolute; top: 0px; z-index: 0; - background: #44A7A1; + background: #c6903e; color: #fff; border-radius: 50%; border: 0px; diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 08a64937..b0a42369 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -59,7 +59,7 @@ - +
@@ -70,7 +70,7 @@
+ style="background: #c6903e; border-radius: 0px 0px 10px 10px;">