-
+
@@ -63,14 +63,14 @@
-
-
-
-
+
+
+
+
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index 314eb12d0..79df9b441 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -96,6 +96,10 @@
border-color: transparent !important;
}
+.ion-icon-class-theme {
+ color: var(--profile-text-color) ;
+}
+
.login-preference{
margin-top: 15px;
float: left;
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 3f0acc240..55b8fc6c7 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -9,7 +9,8 @@ import { NotificationsService } from 'src/app/services/notifications.service';
import { SessionStore } from 'src/app/store/session.service';
import { ClearStoreService } from 'src/app/services/clear-store.service';
import { ChangeProfileService } from 'src/app/services/change-profile.service';
-import { ThemeService } from 'src/app/services/theme.service'
+import { ThemeService } from 'src/app/services/theme.service';
+import { StorageService } from 'src/app/services/storage.service'
@Component({
selector: 'app-login',
@@ -37,11 +38,15 @@ export class LoginPage implements OnInit {
public alertController: AlertController,
private clearStoreService: ClearStoreService,
private changeProfileService: ChangeProfileService,
- public ThemeService: ThemeService
+ public themeservice: ThemeService,
+ private storageservice: StorageService
) {}
ngOnInit() {
-
+ this.storageservice.get('theme').then((theme) =>{
+ console.log('LOGIN THEME',theme)
+ this.themeservice.setTheme(theme)
+ })
}
//Function to validade the login inputs
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index f1172d192..5cb817ed6 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -177,7 +177,7 @@ ion-toolbar{
}
.item:hover{
- background-color: #e6f6ff75;
+ background-color: var(--box-hover-background-color) !important;
}
ion-item-options{
diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts
index 3831ed5e7..e1670c200 100644
--- a/src/app/services/background.service.ts
+++ b/src/app/services/background.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+import { ThemeService } from 'src/app/services/theme.service';
@Injectable({
providedIn: 'root'
@@ -11,14 +12,27 @@ export class BackgroundService {
funx: Function
}[] = []
- constructor() { }
+ constructor(
+ private themeservice: ThemeService
+ ) { }
online() {
- document.body.style.setProperty(`--color`, "#0782C9");
- document.body.style.setProperty(`--color2`, "#45BAFF");
- document.body.style.setProperty(`--color3`, "#0782C9");
- document.body.style.setProperty(`--color4`, "#0782c9f0");
- document.body.style.setProperty(`--color5`, "#45BAFF");
+ if (this.themeservice.currentTheme == 'gov') {
+
+ document.body.style.setProperty(`--color`, "#d9d9d9");
+ document.body.style.setProperty(`--color2`, "#f0f0f0");
+ document.body.style.setProperty(`--color3`, "#d9d9d9");
+ document.body.style.setProperty(`--color4`, "#d9d9d9ee");
+ document.body.style.setProperty(`--color5`, "#ececec");
+
+ } else {
+ document.body.style.setProperty(`--color`, "#0782C9");
+ document.body.style.setProperty(`--color2`, "#45BAFF");
+ document.body.style.setProperty(`--color3`, "#0782C9");
+ document.body.style.setProperty(`--color4`, "#0782c9f0");
+ document.body.style.setProperty(`--color5`, "#45BAFF");
+ }
+
this.callBacks.forEach((e) => {
if (e.type == 'Online') {
e.funx()
diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts
index fdf345739..885d7fed2 100644
--- a/src/app/services/theme.service.ts
+++ b/src/app/services/theme.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+import { StorageService } from 'src/app/services/storage.service';
@Injectable({
providedIn: 'root'
@@ -12,7 +13,7 @@ export class ThemeService {
currentTheme = 'gov'
- constructor() { }
+ constructor(private storageservice: StorageService) { }
setTheme(theme: 'gov' | 'default') {
@@ -20,7 +21,8 @@ export class ThemeService {
document.body.classList.remove("default");
document.body.classList.add(theme);
this.currentTheme = theme
- console.log('Current theme', theme)
+ console.log('Current theme', theme);
+ this.storageservice.store('theme',theme);
}
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index ec531d7bf..31217596e 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -375,7 +375,7 @@ $app-theme: mat-light-theme(
} */
.item-hover:hover {
- background-color: var(--box-hover-background-color);
+ background-color: var(--box-hover-background-color) !important;
}
.box-hover:hover {
+