diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a0360274e..7be7347da 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -114,11 +114,13 @@ - + + - + + @@ -180,10 +182,13 @@ - + + - + + + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index edaca3579..f1d47b0f3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -31,6 +31,7 @@ import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ @@ -176,7 +177,8 @@ export class AgendaPage implements OnInit { private changeProfileService: ChangeProfileService, private sqliteservice: SqliteService, private platform: Platform, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.dateAdapter.setLocale('es'); diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index f802c4aed..a3b734557 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -8,7 +8,10 @@ - + + + + diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index e83bae32f..3f0acc240 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -9,6 +9,7 @@ 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' @Component({ selector: 'app-login', @@ -35,9 +36,9 @@ export class LoginPage implements OnInit { private toastService: ToastService, public alertController: AlertController, private clearStoreService: ClearStoreService, - private changeProfileService: ChangeProfileService - ) { - } + private changeProfileService: ChangeProfileService, + public ThemeService: ThemeService + ) {} ngOnInit() { diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index d1ae5d28b..866dfbbcf 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -26,7 +26,8 @@ - + + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 81a1d09b0..b96eb8e80 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -15,6 +15,7 @@ import { PublicationEventFolderStorage } from 'src/app/store/publication-event-f import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-publications', @@ -66,7 +67,8 @@ export class PublicationsPage implements OnInit { private toastService: ToastService, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, - private platform: Platform + private platform: Platform, + public ThemeService: ThemeService ) { this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; this.days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 508f6e140..ee14eb539 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -16,7 +16,8 @@ - + + diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index b45c00feb..f056a7689 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -9,7 +9,8 @@ - + + 0" class="icon-badge">{{this.notificationLength}} @@ -21,7 +22,10 @@ - + + + + diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index b8b4f2aa0..b11435853 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -14,7 +14,8 @@ - + + diff --git a/src/assets/images/theme/gov/gabinetedigital_logo.png b/src/assets/images/theme/gov/gabinetedigital_logo.png new file mode 100644 index 000000000..75708e4c3 Binary files /dev/null and b/src/assets/images/theme/gov/gabinetedigital_logo.png differ diff --git a/src/assets/images/theme/gov/governoangola_A.png b/src/assets/images/theme/gov/governoangola_A.png new file mode 100644 index 000000000..9c360396a Binary files /dev/null and b/src/assets/images/theme/gov/governoangola_A.png differ diff --git a/src/assets/images/theme/gov/icons-add.svg b/src/assets/images/theme/gov/icons-add.svg new file mode 100644 index 000000000..d7ecdaa09 --- /dev/null +++ b/src/assets/images/theme/gov/icons-add.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg index e62623ebf..e75c82ae4 100644 --- a/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg +++ b/src/assets/images/theme/gov/icons-arrow-circle-arrow-right.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/assets/images/theme/gov/icons-collaps-down.svg b/src/assets/images/theme/gov/icons-collaps-down.svg new file mode 100644 index 000000000..e2930614e --- /dev/null +++ b/src/assets/images/theme/gov/icons-collaps-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-collaps-up.svg b/src/assets/images/theme/gov/icons-collaps-up.svg new file mode 100644 index 000000000..f7678ebca --- /dev/null +++ b/src/assets/images/theme/gov/icons-collaps-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-received-event.svg b/src/assets/images/theme/gov/icons-received-event.svg new file mode 100644 index 000000000..ddeddbc08 --- /dev/null +++ b/src/assets/images/theme/gov/icons-received-event.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 6c0fb35a3..406a2b092 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -532,7 +532,7 @@ $app-theme: mat-light-theme(( } .btn-cancel:hover, .btn-delete:hover{ - background-color: #42b9fe; + background-color: var(--button-hover); color: #ffffff !important; }