From 55f5fd822dfbb6560f24e9bd447ed5c2d75e711e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 20 Oct 2021 17:46:03 +0100 Subject: [PATCH 01/69] New themes added --- package-lock.json | 8 + package.json | 1 + src/app/app.module.ts | 5 +- .../edit-profile/edit-profile.page.html | 50 ++++-- .../profile/edit-profile/edit-profile.page.ts | 15 +- .../diplomas-assinar/diplomas-assinar.page.ts | 2 +- src/app/services/background.service.ts | 31 ++++ src/app/shared/header/header.page.html | 161 ++++++++++-------- .../images/icons-nav-home-active-black.svg | 18 ++ src/global.scss | 22 +++ 10 files changed, 222 insertions(+), 91 deletions(-) create mode 100644 src/assets/images/icons-nav-home-active-black.svg diff --git a/package-lock.json b/package-lock.json index 1f90ffb86..3fb80d1ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4417,6 +4417,14 @@ } } }, + "angular-svg-icon": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/angular-svg-icon/-/angular-svg-icon-12.0.0.tgz", + "integrity": "sha512-nPAbF/U6sHdY+Dt/J5TZuUNOGRZmxoqJioRfLGMeNt8ycbBbTwq1OmkZ7DLuF02+XGafGHwzmI5/2y9OWAl+TA==", + "requires": { + "tslib": "^2.2.0" + } + }, "angular-tag-cloud-module": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/angular-tag-cloud-module/-/angular-tag-cloud-module-5.3.0.tgz", diff --git a/package.json b/package.json index 7a56af1fc..2db5a1299 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "@types/jest-environment-puppeteer": "^4.4.1", "@types/puppeteer": "^5.4.4", "angular-calendar": "^0.28.22", + "angular-svg-icon": "^12.0.0", "angular-tag-cloud-module": "^5.2.2", "bootstrap": "^4.5.0", "build": "0.1.4", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b3a8964f6..432651851 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -58,6 +58,7 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; import { PdfViewerModule } from 'ng2-pdf-viewer'; import { SQLite } from '@ionic-native/sqlite/ngx'; import { CookieService } from 'ngx-cookie-service'; +import { AngularSvgIconModule } from 'angular-svg-icon'; @NgModule({ declarations: [AppComponent], @@ -92,6 +93,7 @@ import { CookieService } from 'ngx-cookie-service'; // PdfViewerModule, HammerModule, + AngularSvgIconModule.forRoot() ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, @@ -112,7 +114,8 @@ import { CookieService } from 'ngx-cookie-service'; Network, File, SQLite, - CookieService + CookieService, + AngularSvgIconModule ], bootstrap: [AppComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 74fc9bf48..fbce6b95a 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -21,9 +21,9 @@ --> -
+
- +
@@ -51,15 +51,41 @@
+ +
+
+
Tema
+
+
+ +
+
+
+ + +
+ +
+ +
+ +
+ +
+ +
+
+ +
Preferência Login
-
- +
+ PIN
@@ -77,15 +103,15 @@
- - - - - + + + +
- + \ No newline at end of file diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.ts b/src/app/modals/profile/edit-profile/edit-profile.page.ts index e535c7127..76bd6d6ab 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.ts +++ b/src/app/modals/profile/edit-profile/edit-profile.page.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { AnimationController, ModalController } from '@ionic/angular'; +import { AnimationController, ModalController,Platform } from '@ionic/angular'; import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page'; import { PinPage } from 'src/app/shared/pin/pin.page'; import { SessionStore } from 'src/app/store/session.service'; import { environment } from 'src/environments/environment'; -import { Platform } from '@ionic/angular'; +import { BackgroundService } from 'src/app/services/background.service'; @Component({ selector: 'app-edit-profile', @@ -19,6 +19,7 @@ export class EditProfilePage implements OnInit { constructor(private modalController:ModalController, private animationController: AnimationController, public platform: Platform, + private backgroundservice: BackgroundService ) {} ngOnInit() {} @@ -113,5 +114,15 @@ export class EditProfilePage implements OnInit { } + changeTheme(name) { + /* this.theme.setTheme(themes[name]); */ + if(name == 'grey') { + this.backgroundservice.greyTheme(); + } else if (name == 'blue') { + this.backgroundservice.blueTheme(); + } + + } + } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 690222b2a..51172c2f5 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -3,7 +3,7 @@ import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; -import { ModalController, NavParams } from '@ionic/angular'; +import { ModalController, NavParams, Platform } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index 84ed29d7c..8f8818147 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -46,4 +46,35 @@ export class BackgroundService { object }) } + + + greyTheme() { + 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"); + + document.body.style.setProperty(`--header-container-background`, "#fff"); + document.body.style.setProperty(`--headercolor`, "#000"); + + document.body.style.setProperty(`--header-bottom-line-background`, "rgb(255, 0, 0)"); + document.body.style.setProperty(`--header-bottom-line-background-image`, "linear-gradient(to right, #C63527, #FFB81C, #FFC72C)"); + } + + blueTheme() { + + 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`, "#f7f5f2"); + + document.body.style.setProperty(`--header-container-background`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + document.body.style.setProperty(`--headercolor`, "#000"); + + document.body.style.setProperty(`--header-bottom-line-background`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + document.body.style.setProperty(`--header-bottom-line-background-image`, "linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important"); + + } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 6c0d2b66c..a63e6df67 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -1,94 +1,105 @@ -
+
+
-
-
-
- +
+
+
+ +
-
- -
-
{{this.notificationLength}}
- - {{loggeduser.Profile}} -
-
- -
-
-
{{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/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index a566bfdcc..a2ef20d21 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -20,6 +20,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { PedidoService } from 'src/app/Rules/pedido.service' import { fullTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -97,7 +99,8 @@ export class CreateProcessPage implements OnInit { private toastService: ToastService, public p: PermissionService, private despachoService: DespachoService, - private pedidoService: PedidoService + private pedidoService: PedidoService, + public ThemeService: ThemeService ) { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html index fea6be656..13b29df72 100644 --- a/src/app/modals/delegar/delegar.page.html +++ b/src/app/modals/delegar/delegar.page.html @@ -24,7 +24,8 @@
- + +
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 1a1116285..81e57b3ca 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-delegar', @@ -52,6 +54,7 @@ export class DelegarPage implements OnInit { private alertService: AlertService, private animationController: AnimationController, private toastService: ToastService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task'); this.postData = new Event(); diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index f34b17ec6..fe1858adb 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -276,7 +276,8 @@
- + +
@@ -297,7 +298,8 @@
- + +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 947058b71..3d2429b35 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -17,6 +17,8 @@ import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-pick import { EventsService } from 'src/app/services/events.service'; import { EventService } from 'src/app/services/rules/event.service'; import { EventPipe } from 'src/app/pipes/event.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -96,7 +98,8 @@ export class DocumentSetUpMeetingPage implements OnInit { authService: AuthService, private toastService: ToastService, private calendarService: EventsService, - private eventService: EventService + private eventService: EventService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; this.document = this.navParams.get('document') diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index b8c0e22b6..837e47811 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -24,7 +24,8 @@
- + +
diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index ede8b6f3b..d56c77b7a 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-forward', @@ -53,6 +55,7 @@ export class ForwardPage implements OnInit { private alertService: AlertService, private animationController: AnimationController, private toastService: ToastService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task'); this.postData = new Event(); diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 7be7347da..53e4bfa2b 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -30,7 +30,8 @@
@@ -40,7 +41,8 @@ {{ viewTitle }}
- + +
@@ -99,7 +101,8 @@ -->
- + +
@@ -200,7 +203,8 @@
{{timelineFilterState}}
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 928c7d14f..8073765e1 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -205,7 +205,8 @@
- + +
@@ -226,7 +227,8 @@
- + +
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 37ee65584..8cd58e2f1 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -11,6 +11,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-edit-event', @@ -56,6 +58,7 @@ export class EditEventPage implements OnInit { private attachmentsService: AttachmentsService, private toastService: ToastService, private router: Router, + public ThemeService: ThemeService ) { this.postEvent = new Event(); diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index b7aa03b6c..5b09bead6 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -209,7 +209,8 @@
- + +
@@ -236,7 +237,8 @@
- + +
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index fb5d5d4e4..2c9954bcd 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -15,6 +15,7 @@ import { SearchPage } from '../../search/search.page'; import { ThemePalette } from '@angular/material/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { EventRecurrence } from 'src/app/models/agenda/eventrecurrence.model'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ @@ -67,6 +68,7 @@ export class NewEventPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, userService: AuthService, + public ThemeService: ThemeService ) { this.loggeduser = userService.ValidatedUser; this.postEvent = new Event(); diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 88e6d3afa..65b1a2ff9 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -23,7 +23,8 @@
- + +
@@ -297,7 +298,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index a563b56ee..7411339b3 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -19,6 +19,8 @@ import * as _moment from 'moment'; import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ThemeService } from 'src/app/services/theme.service' + const moment = _rollupMoment || _moment; @@ -125,6 +127,7 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private toastService: ToastService, private activatedRoute: ActivatedRoute, + public ThemeService: ThemeService ) { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 3a830460c..8e1c308f6 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -143,7 +143,8 @@
- + +
@@ -164,7 +165,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 6e36b5227..66a2f128e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -22,6 +22,8 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker' import { task } from 'src/app/models/ExpedientTaskModalPage'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { SearchDocumentPipe } from 'src/app/pipes/search-document.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -106,7 +108,8 @@ export class ExpedientTaskModalPage implements OnInit { private alertController: AlertService, private userAuth: AuthService, private toastService: ToastService, - private despachoService: DespachoService + private despachoService: DespachoService, + public ThemeService: ThemeService ) { this.loggeduser = userAuth.ValidatedUser; diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 1c484cf20..ce3d140fa 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -290,7 +290,8 @@
- + +
@@ -311,7 +312,8 @@
- + +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 347c6d60c..5570ca88b 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -13,6 +13,8 @@ import { ToastService } from 'src/app/services/toast.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; +import { ThemeService } from 'src/app/services/theme.service' + const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -125,6 +127,7 @@ export class EditEventToApprovePage implements OnInit { private attachmentsService: AttachmentsService, private processes:ProcessesService, private toastService: ToastService, + public ThemeService: ThemeService ) { this.isEventEdited = false; } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 7005206c6..6d69a901a 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -230,7 +230,8 @@
@@ -253,7 +254,8 @@
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index ef090f493..682380246 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -12,6 +12,8 @@ import { Attachment } from 'src/app/models/attachment.model'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ParticipantsPipe } from 'src/app/pipes/participants.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-edit-event', @@ -89,6 +91,7 @@ export class EditEventPage implements OnInit { public alertController: AlertController, private attachmentsService: AttachmentsService, private toastService: ToastService, + public ThemeService: ThemeService ) {} ngOnInit() { diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 0dce0afc6..c41132d62 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -248,7 +248,8 @@
- + +
@@ -271,7 +272,8 @@
- + +
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index c3976d055..bcf7d5dc4 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -24,6 +24,8 @@ import { ThemePalette } from '@angular/material/core'; import { ViewChild } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ThemeService } from 'src/app/services/theme.service' + const moment = _rollupMoment || _moment; @@ -118,6 +120,7 @@ export class NewEventPage implements OnInit { private toastService: ToastService, private userService: AuthService, private dateAdapter: DateAdapter, + public ThemeService: ThemeService // private translate: TranslateService ) { this.dateAdapter.setLocale('pt'); diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index af3cd398f..a9e48023c 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -4,7 +4,8 @@
@@ -13,7 +14,8 @@
- + +
@@ -305,7 +306,8 @@
- + +
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 78837cf93..2c00a6a17 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -12,7 +12,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { Event, EventToApproveEdit } from '../../../models/event.model'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { NavigationExtras, Router } from '@angular/router'; - +import { ThemeService } from 'src/app/services/theme.service' const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -117,6 +117,7 @@ export class EditEventToApproveComponent implements OnInit { private animationController: AnimationController, private toastService: ToastService, private router:Router, + public ThemeService: ThemeService ) { // Edit event to approve this.serialNumber = this.navParams.get('serialNumber'); diff --git a/src/assets/images/theme/gov/icons-arrow-arrow-down.svg b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg new file mode 100644 index 000000000..b464cabbf --- /dev/null +++ b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-arrow-forward.svg b/src/assets/images/theme/gov/icons-arrow-forward.svg new file mode 100644 index 000000000..177a9f643 --- /dev/null +++ b/src/assets/images/theme/gov/icons-arrow-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-left.svg b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg new file mode 100644 index 000000000..e0763dca8 --- /dev/null +++ b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-right.svg b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg new file mode 100644 index 000000000..0c68f3d31 --- /dev/null +++ b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-edit.svg b/src/assets/images/theme/gov/icons-edit.svg new file mode 100644 index 000000000..38611c651 --- /dev/null +++ b/src/assets/images/theme/gov/icons-edit.svg @@ -0,0 +1,8 @@ + + + + + + + + From 456b21547ec2219bd6dce0f7aef3076484b953b8 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 23 Oct 2021 09:21:26 +0100 Subject: [PATCH 16/69] Fix --- src/app/modals/document-detail/document-detail.page.html | 1 + src/app/modals/forward/forward.page.html | 2 +- src/assets/images/theme/gov/icons-menu.svg | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/assets/images/theme/gov/icons-menu.svg diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 94d1a3f0e..e5424b12e 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -10,6 +10,7 @@
+
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 837e47811..833550f32 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -25,7 +25,7 @@
- +
diff --git a/src/assets/images/theme/gov/icons-menu.svg b/src/assets/images/theme/gov/icons-menu.svg new file mode 100644 index 000000000..9244ad2b4 --- /dev/null +++ b/src/assets/images/theme/gov/icons-menu.svg @@ -0,0 +1,5 @@ + + + + + From d4e91d75b2fde866a4542247675ab852bf2e3f0d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Sat, 23 Oct 2021 09:53:21 +0100 Subject: [PATCH 17/69] add icons theme --- .gitignore | 2 +- src/app/pages/chat/chat.page.html | 2 +- .../pages/chat/group-messages/group-messages.page.html | 6 ++++-- src/app/pages/chat/group-messages/group-messages.page.ts | 2 ++ src/app/pages/chat/messages/messages.page.html | 6 ++++-- src/app/pages/chat/messages/messages.page.ts | 3 ++- .../gabinete-digital/despachos-pr/despachos-pr.page.html | 2 +- .../pages/gabinete-digital/despachos/despachos.page.html | 2 +- .../diplomas-assinar/diplomas-assinar.page.html | 2 +- .../pages/gabinete-digital/diplomas/diplomas.page.html | 2 +- .../gabinete-digital/expediente/expediente.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../pages/gabinete-digital/gabinete-digital.page.html | 2 +- src/app/pages/gabinete-digital/pedidos/pedidos.page.html | 2 +- .../pages/gabinete-digital/pendentes/pendentes.page.html | 2 +- src/app/pages/publications/publications.page.html | 2 +- src/app/shared/agenda/event-list/event-list.page.html | 2 +- .../shared/chat/group-messages/group-messages.page.html | 6 ++++-- .../shared/chat/group-messages/group-messages.page.ts | 3 ++- src/app/shared/chat/messages/messages.page.html | 6 ++++-- src/app/shared/chat/messages/messages.page.ts | 2 ++ .../all-processes/all-processes.page.html | 2 +- .../gabinete-digital/despachos-pr/despachos-pr.page.html | 2 +- .../gabinete-digital/despachos/despachos.page.html | 2 +- .../diplomas-assinar/diplomas-assinar.page.html | 2 +- .../shared/gabinete-digital/diplomas/diplomas.page.html | 2 +- .../events-to-approve/events-to-approve.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../gabinete-digital/expedients/expedients.page.html | 2 +- .../shared/gabinete-digital/pedidos/pedidos.page.html | 2 +- .../gabinete-digital/pendentes/pendentes.page.html | 2 +- .../view-publications/view-publications.page.html | 2 +- src/assets/icon/theme/gov/icons-chat-send.svg | 7 +++++++ src/assets/images/theme/gov/icons-arrow-arrow-down.svg | 2 +- src/assets/images/theme/gov/icons-arrow-forward.svg | 2 +- .../images/theme/gov/icons-calendar-arrow-left.svg | 2 +- .../images/theme/gov/icons-calendar-arrow-right.svg | 2 +- .../images/theme/gov/icons-chat-new-conversation.svg | 6 ------ src/assets/images/theme/gov/icons-menu.svg | 6 +++--- src/theme/variables.scss | 9 +++++++-- 40 files changed, 69 insertions(+), 49 deletions(-) create mode 100644 src/assets/icon/theme/gov/icons-chat-send.svg delete mode 100644 src/assets/images/theme/gov/icons-chat-new-conversation.svg diff --git a/.gitignore b/.gitignore index 8e9cdb052..b7f0e141f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,4 @@ src/app/store/notification.service.ts src/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf -node_modules_ \ No newline at end of file +node_modules_ diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index f2b97e047..635cc9552 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -26,7 +26,7 @@ diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index cdf628d87..10dc91522 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -137,10 +137,12 @@
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 55922891b..0dfb1c570 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -19,6 +19,7 @@ import { environment } from 'src/environments/environment'; import { NewEventPage } from '../../agenda/new-event/new-event.page'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-group-messages', @@ -73,6 +74,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { private fileToBase64Service: FileToBase64Service, private fileService: FileService, private toastService: ToastService, + public ThemeService: ThemeService ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index c29f6e2a5..4d6196486 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -138,10 +138,12 @@
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 0c01a9ea7..cf421056f 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -19,7 +19,7 @@ import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/mes import { ChatMessageStore } from 'src/app/store/chat/chat-message.service'; import { ChatUserStorage } from 'src/app/store/chat/chat-user.service'; import { environment } from 'src/environments/environment'; - +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-messages', @@ -73,6 +73,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { private fileService: FileService, private gestureController: GestureController, private processes: ProcessesService, + public ThemeService: ThemeService ) { /* this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index ba99a0b31..d77699ead 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -11,7 +11,7 @@
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 59b84271b..8718914d9 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -10,7 +10,7 @@
Despachos
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 76b0bd36e..fc68d323e 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -9,7 +9,7 @@
Diplomas

Diplomas por Assinar

diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 9c1698219..5a7c32be9 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -9,7 +9,7 @@
Diplomas
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 41a32a4cb..533463cba 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -15,7 +15,7 @@
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 8098c5464..0d02b0a37 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -10,7 +10,7 @@
Expediente
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 611a1f017..6bd12de63 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -18,7 +18,7 @@ Gabinete Digital
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 0b6ff7050..81ac61849 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -8,7 +8,7 @@
Pedidos
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 43af02c1b..63bd7008b 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -9,7 +9,7 @@
Pendentes
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 866dfbbcf..2586e8938 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -30,7 +30,7 @@ diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index d62e48cca..62932ed7d 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -4,7 +4,7 @@
Eventos para Aprovação
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index f186c0e6a..fd3607759 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -163,10 +163,12 @@
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 8b10e1990..32a3739df 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -18,7 +18,7 @@ import { SearchList } from 'src/app/models/search-document'; import { ProcessesService } from 'src/app/services/processes.service'; import { FileService } from 'src/app/services/functions/file.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; - +import { ThemeService } from 'src/app/services/theme.service' /* import * as pdfjsLib from 'pdfjs-dist'; @@ -84,6 +84,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe private fileToBase64Service: FileToBase64Service, private processesService: ProcessesService, private fileService: FileService, + public ThemeService: ThemeService ) { this.loggedUserChat = authService.ValidatedUserChat['data']; this.isGroupCreated = true; diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 648d9ed68..4f1188bf3 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -141,10 +141,12 @@
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 140abd646..8f11f9533 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -15,6 +15,7 @@ import { TimeService } from 'src/app/services/functions/time.service'; import { FileService } from 'src/app/services/functions/file.service'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-messages', @@ -70,6 +71,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private fileService: FileService, private gestureController: GestureController, private http:HttpClient, + public ThemeService: ThemeService ) { this.loggedUser = authService.ValidatedUserChat['data']; diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index c1c5b30a6..1f371399a 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -3,7 +3,7 @@
Todas as tarefas
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 9d64f4db1..e18247748 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,7 +6,7 @@
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index c161a0c78..a0ea8b3b6 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -3,7 +3,7 @@
Despachos
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 36f91d6e7..1d878c9dd 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -3,7 +3,7 @@
Diplomas

Diplomas para Assinar

diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 056dec629..753410ff1 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -3,7 +3,7 @@
Diplomas
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index c3d4f6f0c..5d96dfe12 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -3,7 +3,7 @@
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 164aec4fb..5e5ee7b7c 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -3,7 +3,7 @@
Expediente
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index cff3e4143..e2c7c1c9b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -3,7 +3,7 @@
Expediente
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 97a5a57bb..48f9bed88 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -3,7 +3,7 @@
Pedidos
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 88b43af3c..fd63e6214 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -3,7 +3,7 @@
Pendentes
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 b11435853..06dfe3b1b 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -18,7 +18,7 @@ diff --git a/src/assets/icon/theme/gov/icons-chat-send.svg b/src/assets/icon/theme/gov/icons-chat-send.svg new file mode 100644 index 000000000..cd0ae4e61 --- /dev/null +++ b/src/assets/icon/theme/gov/icons-chat-send.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/icons-arrow-arrow-down.svg b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg index b464cabbf..2301d7486 100644 --- a/src/assets/images/theme/gov/icons-arrow-arrow-down.svg +++ b/src/assets/images/theme/gov/icons-arrow-arrow-down.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/images/theme/gov/icons-arrow-forward.svg b/src/assets/images/theme/gov/icons-arrow-forward.svg index 177a9f643..c91219161 100644 --- a/src/assets/images/theme/gov/icons-arrow-forward.svg +++ b/src/assets/images/theme/gov/icons-arrow-forward.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-left.svg b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg index e0763dca8..a2ebf8999 100644 --- a/src/assets/images/theme/gov/icons-calendar-arrow-left.svg +++ b/src/assets/images/theme/gov/icons-calendar-arrow-left.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/images/theme/gov/icons-calendar-arrow-right.svg b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg index 0c68f3d31..3264d7215 100644 --- a/src/assets/images/theme/gov/icons-calendar-arrow-right.svg +++ b/src/assets/images/theme/gov/icons-calendar-arrow-right.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/images/theme/gov/icons-chat-new-conversation.svg b/src/assets/images/theme/gov/icons-chat-new-conversation.svg deleted file mode 100644 index 08c91d1b9..000000000 --- a/src/assets/images/theme/gov/icons-chat-new-conversation.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/images/theme/gov/icons-menu.svg b/src/assets/images/theme/gov/icons-menu.svg index 9244ad2b4..4910abc4d 100644 --- a/src/assets/images/theme/gov/icons-menu.svg +++ b/src/assets/images/theme/gov/icons-menu.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 75de6af1c..fbe41f644 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -633,7 +633,7 @@ body { --header-container-background: #fff; --header-bottom-line-background: rgb(255, 0, 0); --header-bottom-line-background-image: linear-gradient(to right, #C63527, #FFB81C, #FFC72C); - + --font-awesome: #FFB81C; --color: #D9D9D9; --color2: #f0f0f0; @@ -655,7 +655,7 @@ body { --header-container-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; --header-bottom-line-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; --header-bottom-line-background-image: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; - + --font-awesome: #42b9fe; --color: #0782c9; --color2: #45baff; --color3: #0782c9; @@ -665,3 +665,8 @@ body { --title-text-color: #0d89d1; --subtitle-text-color: #000 } + + +.font-awesome { + color: var(--font-awesome) !important; +} \ No newline at end of file From b93f860bb2e6349dec94f92766becdcdefac078a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Sun, 24 Oct 2021 19:17:28 +0100 Subject: [PATCH 18/69] title tex color change --- src/app/pages/agenda/agenda.page.scss | 7 ++++--- src/app/pages/agenda/edit-event/edit-event.page.scss | 4 ++-- src/app/pages/agenda/new-event/new-event.page.scss | 4 ++-- src/app/pages/agenda/view-event/view-event.page.scss | 4 ++-- src/app/pages/chat/chat.page.scss | 2 +- src/app/pages/events/events.page.scss | 2 +- .../pages/gabinete-digital/despachos/despachos.page.scss | 2 +- .../approve-event-modal/approve-event-modal.page.scss | 6 +++--- .../event-list/approve-event/approve-event.page.scss | 4 ++-- .../pages/gabinete-digital/event-list/event-list.page.scss | 2 +- .../pages/gabinete-digital/expediente/expediente.page.scss | 2 +- src/app/pages/gabinete-digital/gabinete-digital.page.scss | 5 ++--- src/app/pages/publications/publications.page.scss | 2 +- src/app/shared/agenda/event-list/event-list.page.scss | 2 +- .../events-to-approve/events-to-approve.page.scss | 2 +- src/theme/variables.scss | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 2de80d83d..166c35b25 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -409,10 +409,10 @@ td.monthview-primary-with-event { font-weight: normal; ion-icon{ font-size: 35px; - color: #0d89d1; + color: var(--title-text-color); } .filter-name{ - color: #0d89d1; + color: var(--title-text-color); font-family: Roboto; font-size: 15px; margin-right: 25px; @@ -512,7 +512,7 @@ td.monthview-primary-with-event { font-family: Roboto; font-size: 15px; font-weight: bold; - color: #0d89d1; + color: var(--title-text-color); } .description p{ @@ -600,6 +600,7 @@ td.monthview-primary-with-event { .container-wrapper{ height: 100%; overflow: hidden; + padding-top: 1%; .calendar-timeline{ border-top-right-radius: 24px; diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index 35002e5a5..4246e9f99 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -91,7 +91,7 @@ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color);; margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -104,7 +104,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 3090c356e..c685abcbf 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -108,7 +108,7 @@ ion-content{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -121,7 +121,7 @@ ion-content{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss index cda6ac60b..44837e303 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -185,7 +185,7 @@ ion-menu{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -198,7 +198,7 @@ ion-menu{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 50c2afa74..630a1d07f 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -101,7 +101,7 @@ ion-content{ width: calc(100% - 75px); float: left; font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); } .item-title-active{ color: #fff; diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 7aeb94b6b..d0e6f8046 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -308,7 +308,7 @@ ion-toolbar{ font-size: em(25px); font-family: Roboto; font-weight: 300; - color: var(--white); + color: var(--header-tab-text-white); margin-right: 7px; } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index 2a49ee468..a4421e515 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -133,7 +133,7 @@ ion-item{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss index c1a015535..347959730 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss @@ -82,7 +82,7 @@ ion-menu{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -95,7 +95,7 @@ ion-menu{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -180,7 +180,7 @@ display: none; .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss index 2199dbb8a..6937abe54 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss @@ -97,7 +97,7 @@ ion-menu{ } .attach-document{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color); margin: 5px 5px 5px 10px; padding: 5px; float: left; @@ -110,7 +110,7 @@ ion-menu{ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.scss b/src/app/pages/gabinete-digital/event-list/event-list.page.scss index 79e97df02..dd4581f25 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.scss +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.scss @@ -115,7 +115,7 @@ ion-item-sliding{ font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--header-tab-text-white); margin: 0; padding: 0; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index 9fcfa6835..f5085216c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -129,7 +129,7 @@ ion-item{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .subject{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 20f96d556..3f0f378b1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -201,12 +201,11 @@ ion-segment-button{ } .exp-card-title{ font-size: 15px; - color: #0d89d1; + color: var(--title-text-color);; font-family: Roboto; font-weight: bold; font-stretch: normal; font-style: normal; - color: #0d89d1; margin: 15px 0 0 10px; text-align: center; } @@ -272,7 +271,7 @@ ion-list{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .item-subject{ diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 9c7c8c04b..816a80131 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -149,7 +149,7 @@ ion-toolbar{ padding: 0 !important; } .item-content-title{ - color: #0d89d1; + color: var(--title-text-color); font-size: 15px; margin: 0 !important; padding: 0 !important; diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss index 0d1e3c664..79d6af211 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -98,7 +98,7 @@ font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--header-tab-text-white); margin: 0; padding: 0; } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss index d0a8dbd65..89ccd421b 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss @@ -92,7 +92,7 @@ font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--title-text-color);; margin: 0; padding: 0; } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 75de6af1c..9c1a639ce 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -484,7 +484,7 @@ $app-theme: mat-light-theme( font-style: normal; line-height: normal; letter-spacing: normal; - color: #0d89d1; + color: var(--header-tab-text-white);; margin: 0; padding: 0; } From e53ecf5a0aae7571270fe35a3537e4307937f857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 25 Oct 2021 09:15:23 +0100 Subject: [PATCH 19/69] Margin top to header added with 20px --- src/app/pages/agenda/agenda.page.scss | 1 - .../gabinete-digital.page.scss | 4 +- .../all-processes/all-processes.page.scss | 2 +- src/global.scss | 1 + src/theme/variables.scss | 46 ++++++++++++++----- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 166c35b25..823d08aee 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -600,7 +600,6 @@ td.monthview-primary-with-event { .container-wrapper{ height: 100%; overflow: hidden; - padding-top: 1%; .calendar-timeline{ border-top-right-radius: 24px; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 3f0f378b1..af414499e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -26,7 +26,7 @@ ion-segment-button{ text-align: center; } .title-container{ - background:#ecf8ff; + background:var(--gabinete-title-container); padding: 30px 20px 15px 20px !important; //margin-bottom: 15px; border-top-left-radius: 25px; @@ -117,7 +117,7 @@ ion-segment-button{ height: 100%; font-family: Roboto; margin: 0 auto; - background:#ecf8ff; + background:var(--gabinete-main-container); overflow:hidden; padding: 0 !important; border-top-left-radius: 25px; diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss index b33103830..ea368428a 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss @@ -51,7 +51,7 @@ ion-list{ font-family: Roboto; font-size: 12pt; font-weight: 700; - color: #0d89d1; + color: var(--title-text-color); padding-left: 3px; .item-subject{ diff --git a/src/global.scss b/src/global.scss index d7fa8d405..868e1d048 100644 --- a/src/global.scss +++ b/src/global.scss @@ -785,6 +785,7 @@ ion-content { app-header .header-container{ background: var(--header-container-background) !important; color: var(--headercolor); + margin-bottom: 20px } app-header .header-bottom-line{ diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 9c1a639ce..a1bb46eae 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -484,7 +484,7 @@ $app-theme: mat-light-theme( font-style: normal; line-height: normal; letter-spacing: normal; - color: var(--header-tab-text-white);; + color: var(--header-tab-text-white); margin: 0; padding: 0; } @@ -541,7 +541,8 @@ $app-theme: mat-light-theme( margin: 0 auto !important; } -.btn-cancel:hover, .btn-delete:hover{ +.btn-cancel:hover, +.btn-delete:hover { background-color: var(--button-hover); color: #ffffff !important; } @@ -632,17 +633,19 @@ body { --header-tab-text-white: rgb(0, 0, 0); --header-container-background: #fff; --header-bottom-line-background: rgb(255, 0, 0); - --header-bottom-line-background-image: linear-gradient(to right, #C63527, #FFB81C, #FFC72C); + --header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c); - - --color: #D9D9D9; + --color: #d9d9d9; --color2: #f0f0f0; - --color3: #D9D9D9; + --color3: #d9d9d9; --color4: #d9d9d9ee; --color5: #ececec; --title-text-color: rgb(0, 0, 0); - --subtitle-text-color: #000 + --subtitle-text-color: #000; + + --gabinete-title-container: #fff; + --gabinete-main-container: #fff; } .default { @@ -652,9 +655,27 @@ body { --header-tab-top-border: white; --header-tab-text-white: white; - --header-container-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; - --header-bottom-line-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; - --header-bottom-line-background-image: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; + --header-container-background: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; + --header-bottom-line-background: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; + --header-bottom-line-background-image: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; --color: #0782c9; --color2: #45baff; @@ -663,5 +684,8 @@ body { --color5: #45baff; --title-text-color: #0d89d1; - --subtitle-text-color: #000 + --subtitle-text-color: #000; + + --gabinete-title-container: #ecf8ff; + --gabinete-main-container: #ecf8ff; } From 342201ae61f45312327c7d0901daa03ec54a308c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 25 Oct 2021 10:53:01 +0100 Subject: [PATCH 20/69] add icons for theme --- src/app/modals/document-detail/document-detail.page.html | 3 ++- src/app/modals/document-detail/document-detail.page.ts | 3 +++ .../modals/profile/edit-profile/edit-profile.page.html | 2 +- src/app/pages/agenda/view-event/view-event.page.html | 3 ++- src/app/pages/chat/messages/messages.page.html | 3 ++- .../despachos-pr/despacho-pr/despacho-pr.page.html | 3 ++- .../despachos-pr/despacho-pr/despacho-pr.page.ts | 2 ++ .../gabinete-digital/despachos-pr/despachos-pr.page.html | 3 ++- .../gabinete-digital/despachos-pr/despachos-pr.page.ts | 2 ++ .../despachos/despacho/despacho.page.html | 3 ++- .../gabinete-digital/despachos/despacho/despacho.page.ts | 5 ++++- .../pages/gabinete-digital/despachos/despachos.page.html | 3 ++- .../pages/gabinete-digital/despachos/despachos.page.ts | 5 ++++- .../diplomas-assinar/diplomas-assinar.page.html | 3 ++- .../diplomas-assinar/diplomas-assinar.page.ts | 3 ++- .../gabinete-digital/diplomas/diploma/diploma.page.html | 3 ++- .../gabinete-digital/diplomas/diploma/diploma.page.ts | 3 +++ .../pages/gabinete-digital/diplomas/diplomas.page.html | 6 ++++-- src/app/pages/gabinete-digital/diplomas/diplomas.page.ts | 3 +++ .../event-list/approve-event/approve-event.page.html | 3 ++- .../event-list/approve-event/approve-event.page.ts | 2 +- .../expediente-detail/expediente-detail.page.html | 3 ++- .../expediente-detail/expediente-detail.page.ts | 4 +++- .../gabinete-digital/expediente/expediente.page.html | 3 ++- .../pages/gabinete-digital/expediente/expediente.page.ts | 5 ++++- .../expedientes-pr/expediente-pr/expediente-pr.page.html | 3 ++- .../expedientes-pr/expediente-pr/expediente-pr.page.ts | 4 +++- .../expedientes-pr/expedientes-pr.page.html | 3 ++- .../expedientes-pr/expedientes-pr.page.ts | 5 ++++- .../pages/gabinete-digital/gabinete-digital.page.html | 3 ++- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 4 +++- .../gabinete-digital/pedidos/pedido/pedido.page.html | 3 ++- .../pages/gabinete-digital/pedidos/pedido/pedido.page.ts | 5 ++++- src/app/pages/gabinete-digital/pedidos/pedidos.page.html | 6 ++++-- src/app/pages/gabinete-digital/pedidos/pedidos.page.ts | 5 ++++- src/app/shared/agenda/view-event/view-event.page.html | 3 ++- .../shared/chat/group-messages/group-messages.page.html | 3 ++- src/app/shared/chat/messages/messages.page.html | 3 ++- .../all-processes/all-processes.page.html | 3 ++- .../gabinete-digital/all-processes/all-processes.page.ts | 3 +++ .../diplomas-assinar/diplomas-assinar.page.html | 3 ++- .../diplomas-assinar/diplomas-assinar.page.ts | 3 +++ .../shared/gabinete-digital/diplomas/diplomas.page.html | 6 ++++-- .../shared/gabinete-digital/diplomas/diplomas.page.ts | 2 ++ .../expedientes-pr/expedientes-pr.page.html | 3 ++- .../expedientes-pr/expedientes-pr.page.ts | 3 +++ .../gabinete-digital/expedients/expedients.page.html | 3 ++- .../gabinete-digital/expedients/expedients.page.ts | 2 ++ .../generic/task-details/task-details.page.html | 3 ++- .../generic/task-details/task-details.page.ts | 5 ++++- .../generic/task-list/task-list.page.html | 3 ++- .../gabinete-digital/generic/task-list/task-list.page.ts | 6 +++++- .../shared/gabinete-digital/pedidos/pedidos.page.html | 6 ++++-- src/app/shared/gabinete-digital/pedidos/pedidos.page.ts | 4 ++++ src/app/shared/header/header.page.html | 9 ++++++--- .../images/theme/gov/icons-expediente-attachment.svg | 3 +++ src/assets/images/theme/gov/icons-profile.svg | 9 +++++++++ 57 files changed, 160 insertions(+), 50 deletions(-) create mode 100644 src/assets/images/theme/gov/icons-expediente-attachment.svg create mode 100644 src/assets/images/theme/gov/icons-profile.svg diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index e5424b12e..1e1c3d8a3 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -9,7 +9,8 @@ {{LoadedDocument.Assunto}}
- + +
diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index 0efb39141..feea81af0 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -11,6 +11,8 @@ import { PermissionService } from 'src/app/services/worker/permission.service'; import { SearchedDocumentOptionsPage } from 'src/app/shared/popover/searched-document-options/searched-document-options.page'; import { Location } from '@angular/common'; import { ViewDocumentPage } from '../view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-document-detail', @@ -45,6 +47,7 @@ export class DocumentDetailPage implements OnInit { public p: PermissionService, private popoverController: PopoverController, private location: Location, + public ThemeService: ThemeService ) { this.docId = this.navParams.get('docId'); this.applicationId = this.navParams.get('applicationId'); diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 41cc8ee3f..9a6073e0d 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -60,7 +60,7 @@
-
+
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 65b1a2ff9..ef098db37 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -98,7 +98,8 @@
- + +
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 4d6196486..90991514d 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -23,7 +23,8 @@
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 265d76f02..52be9074d 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -13,7 +13,8 @@
{{ task.Folio}}
- + +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 554908a6f..e80b51e2b 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -22,6 +22,7 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { Platform } from '@ionic/angular'; 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-despacho-pr', @@ -59,6 +60,7 @@ export class DespachoPrPage implements OnInit { private sqliteservice: SqliteService, private backgroundservice: BackgroundService, private platform: Platform, + public ThemeService: ThemeService ) { this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index d77699ead..55252ed45 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -45,7 +45,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 2b621b25f..80fa3d4be 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -20,6 +20,7 @@ import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-despachos-pr', @@ -63,6 +64,7 @@ export class DespachosPrPage implements OnInit { private sqliteservice: SqliteService, private backgroundservice: BackgroundService, private sortService: SortService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index a938e4ed4..d1468db8e 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -14,7 +14,8 @@ {{ task.Folio}}
- + +
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 8a3f01708..15312a34a 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -22,6 +22,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from 'src/app/services/background.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-despacho', @@ -59,7 +61,8 @@ export class DespachoPage implements OnInit { public p: PermissionService, private sqliteservice: SqliteService, private platform: Platform, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 8718914d9..f8df32bb7 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -43,7 +43,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index d55459f72..966c2deb1 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -7,6 +7,8 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; import { isThisHour } from 'date-fns'; import { BackgroundService } from 'src/app/services/background.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-despachos', @@ -24,7 +26,8 @@ export class DespachosPage implements OnInit { private despachoRule: DespachoService, private sqliteservice: SqliteService, private platform: Platform, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index fc68d323e..b2d4bfe92 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -48,7 +48,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 51172c2f5..e9cfdf5ca 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -8,6 +8,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-diplomas-assinar', @@ -33,7 +34,7 @@ export class DiplomasAssinarPage implements OnInit { private alertService: AlertService, private router: Router, private sortService: SortService, - ) { + public ThemeService: ThemeService) { } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 4e016a8a6..99743d549 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -17,7 +17,8 @@ - + + diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 757cc5000..54c9862f8 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -15,6 +15,8 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { Platform } from '@ionic/angular'; 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-diploma', @@ -49,6 +51,7 @@ export class DiplomaPage implements OnInit { private sqliteservice: SqliteService, private backgroundservice: BackgroundService, private platform: Platform, + public ThemeService: ThemeService ) { this.activatedRoute.paramMap.subscribe(params => { // console.log(params["params"]); diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 5a7c32be9..b5b84d976 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -48,7 +48,8 @@ {{ task.Folio }}
- + +
@@ -84,7 +85,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index ef5613387..49a5df6e8 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -6,6 +6,8 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-diplomas', @@ -31,6 +33,7 @@ export class DiplomasPage implements OnInit, OnDestroy { private sqliteservice: SqliteService, private backgroundservice: BackgroundService, private sortService: SortService, + public ThemeService: ThemeService ) { //Inicializar segment diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 894359f57..c55572e49 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -17,7 +17,8 @@
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 73900b976..eb15015f1 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -61,7 +61,7 @@ export class ApproveEventPage implements OnInit { private sqliteservice: SqliteService, private platform: Platform, private backgroundservice: BackgroundService, - public ThemeService: ThemeService + public ThemeService: ThemeService, ) { this.activatedRoute.paramMap.subscribe(params => { // console.log(params["params"]); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 0b6798f7f..880c45f6c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -19,7 +19,8 @@
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index bd547bae4..b7fdd30e7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -24,6 +24,7 @@ import { TaskService } from 'src/app/Rules/task.service'; import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page'; import { PermissionService } from 'src/app/services/worker/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' import { SqliteService } from 'src/app/services/sqlite.service'; @@ -75,7 +76,8 @@ export class ExpedienteDetailPage implements OnInit { private expedienteService: ExpedienteService, public platform: Platform, private sqliteservice: SqliteService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 533463cba..53d9879d8 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -43,7 +43,8 @@ {{ task.Subject }}
- + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index a2fdf031d..21c9503fb 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -7,6 +7,8 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { SqliteService } from 'src/app/services/sqlite.service'; import { Platform } from '@ionic/angular'; import { BackgroundService } from '../../../services/background.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-expediente', @@ -34,7 +36,8 @@ export class ExpedientePage implements OnInit { private toastService: ToastService, public platform: Platform, private sqliteservice: SqliteService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index dee55234c..3c42341aa 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -19,7 +19,8 @@
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 00159506b..bdf1e1646 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -20,6 +20,7 @@ import { SearchList } from 'src/app/models/search-document'; import { Location } from '@angular/common'; import { AttachmentList } from 'src/app/models/Excludetask'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-expediente-pr', @@ -57,7 +58,8 @@ export class ExpedientePrPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, private attachmentsService: AttachmentsService, - private location: Location + private location: Location, + public ThemeService: ThemeService ) { this.loggeduser = userAuth.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 0d02b0a37..07c372c1a 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -39,7 +39,8 @@ {{ task.Subject }}
- + +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 2ee19036a..f4da1f622 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -11,6 +11,8 @@ import { AuthService } from 'src/app/services/auth.service'; import { Location } from '@angular/common' import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-expedientes-pr', @@ -38,7 +40,8 @@ export class ExpedientesPrPage implements OnInit { private alertService: AlertService, private authService: AuthService, private router: Router, - private location: Location + private location: Location, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 6bd12de63..f3413d165 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -48,7 +48,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 31df012f0..d74544854 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -23,6 +23,7 @@ import { NotificationsService } from 'src/app/services/notifications.service'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { ThemeService } from 'src/app/services/theme.service' import { SqliteService } from '../../services/sqlite.service'; @@ -128,7 +129,8 @@ export class GabineteDigitalPage implements OnInit, DoCheck { private sqliteservice: SqliteService, private platform: Platform, private changeProfileService: ChangeProfileService, - private backgroundservice: BackgroundService + private backgroundservice: BackgroundService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index dfc0d5016..46ffb24a0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -16,7 +16,8 @@
- + +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index a41a13c1a..a3bd8e8f7 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -25,6 +25,8 @@ import { BackgroundService } from 'src/app/services/background.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-pedido', @@ -63,7 +65,8 @@ export class PedidoPage implements OnInit { private pedidoService: PedidoService, private sqliteservice: SqliteService, private backgroundservices: BackgroundService, - private platform: Platform + private platform: Platform, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 81ac61849..002b4a1ac 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -55,7 +55,8 @@ {{ task.Folio }}
- + +
@@ -92,7 +93,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 1195faae0..aa7f23bfb 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -11,6 +11,8 @@ import { ModalService } from 'src/app/services/modal.service'; import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-pedidos', @@ -49,7 +51,8 @@ export class PedidosPage implements OnInit { private sqliteservice: SqliteService, private sortService: SortService, private backgroundservice: BackgroundService, - private platform: Platform + private platform: Platform, + public ThemeService: ThemeService ) { //Inicializar segment this.segment = 'parecer'; diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index a9e48023c..aed6d02ca 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -94,7 +94,8 @@
- + +
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index fd3607759..7e4946900 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -7,7 +7,8 @@
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 4f1188bf3..61631542a 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -8,7 +8,8 @@ diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 1f371399a..59b18648e 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -37,7 +37,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 8e5c542e4..5ccb1343c 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -7,6 +7,8 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'; import { SqliteService } from '../../../services/sqlite.service'; import { Platform } from '@ionic/angular'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-all-processes', @@ -26,6 +28,7 @@ export class AllProcessesPage implements OnInit { private sqliteservice: SqliteService, private platform: Platform, private sortService: SortService, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; } diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 1d878c9dd..f620b9cb4 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -41,7 +41,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 711f6b6d9..2292ba298 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -7,6 +7,8 @@ import { AlertService } from 'src/app/services/alert.service'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-diplomas-assinar', @@ -28,6 +30,7 @@ export class DiplomasAssinarPage implements OnInit { private alertService: AlertService, private router: Router, private sortService: SortService, + public ThemeService: ThemeService ) { } ngOnInit() { diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 753410ff1..648755c77 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -36,7 +36,8 @@ {{ task.Folio }}
- + +
@@ -72,7 +73,8 @@ 1123{{ task.Folio }}
- + +
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 0f7cfaf72..53a5fdeb1 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -7,6 +7,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DeplomasStore } from 'src/app/store/deplomas.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-diplomas', @@ -33,6 +34,7 @@ constructor( private alertService: AlertService, private router: Router, private activatedRoute: ActivatedRoute, + public ThemeService: ThemeService ) { } diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 5e5ee7b7c..3abb6d9de 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -25,7 +25,8 @@ {{ task.Subject }}
- + +
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 53263290d..d03699f52 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -9,6 +9,8 @@ import { AuthService } from 'src/app/services/auth.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-expedientes-pr', @@ -33,6 +35,7 @@ export class ExpedientesPrPage implements OnInit { private alertService: AlertService, private authService: AuthService, private router: Router, + public ThemeService: ThemeService ) { this.loggeduser = authService.ValidatedUser; } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index e2c7c1c9b..815e34d9d 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -33,7 +33,8 @@ {{ task.Subject }}
- + +
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 348545c09..5a45c172b 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -4,6 +4,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-expedients', @@ -26,6 +27,7 @@ export class ExpedientsPage implements OnInit { private processes:ProcessesService, private alertService: AlertService, private router: Router, + public ThemeService: ThemeService ) { this.profile = 'mdgpr'; diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html index 1211313ae..0631bdc88 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html @@ -8,7 +8,8 @@ {{ task.Folio}}
- + +
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts index c959779e3..594f57c78 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.ts @@ -1,5 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-task-details', @@ -18,7 +19,9 @@ export class TaskDetailsPage implements OnInit { @Output() goBack = new EventEmitter(); @Output() viewDocument = new EventEmitter(); - constructor() { } + constructor( + public ThemeService: ThemeService + ) { } ngOnInit() { } diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html index 1358175c1..bbce2a065 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.html @@ -17,7 +17,8 @@ {{ task.Folio }}
- + +
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts index 8395a7ff8..32d53b3c0 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.ts @@ -1,5 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { customTask } from 'src/app/models/dailyworktask.model'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-task-list', @@ -12,7 +14,9 @@ export class TaskListPage implements OnInit { @Input() skeletonLoader: boolean = false @Output() viewTaskDetail = new EventEmitter(); - constructor() { + constructor( + public ThemeService: ThemeService + ) { console.log('taskList', this.taskList) } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 48f9bed88..898c7c71c 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -47,7 +47,8 @@ {{ task.Folio }}
- + +
@@ -84,7 +85,8 @@ {{ task.Folio }} {{ task.Status }}
- + +
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 654c7d20f..a3b37ab9b 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -10,6 +10,9 @@ import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; +import { ThemeService } from 'src/app/services/theme.service' + + @Component({ selector: 'app-pedidos', templateUrl: './pedidos.page.html', @@ -45,6 +48,7 @@ export class PedidosPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private sortService: SortService, + public ThemeService: ThemeService ) { this.profile = 'mdgpr'; } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index f056a7689..b3ebb7e55 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -5,7 +5,8 @@
- + +
{{this.notificationLength}}
- + + {{loggeduser.Profile}}
@@ -99,7 +101,8 @@
- + +
{{profileLabel(loggeduser.Profile)}} diff --git a/src/assets/images/theme/gov/icons-expediente-attachment.svg b/src/assets/images/theme/gov/icons-expediente-attachment.svg new file mode 100644 index 000000000..c392a5e9a --- /dev/null +++ b/src/assets/images/theme/gov/icons-expediente-attachment.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/theme/gov/icons-profile.svg b/src/assets/images/theme/gov/icons-profile.svg new file mode 100644 index 000000000..56b5e2a66 --- /dev/null +++ b/src/assets/images/theme/gov/icons-profile.svg @@ -0,0 +1,9 @@ + + + + + + + + + From 66394379348392debd0af225bd9a1f84d80220cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Mon, 25 Oct 2021 11:19:48 +0100 Subject: [PATCH 21/69] gabinete digital hover color change --- .../gabinete-digital.page.scss | 4 +- src/theme/variables.scss | 51 +++++++++++++++---- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index af414499e..d796b3602 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -559,8 +559,8 @@ ion-list{ .active { color: white !important; fill: white !important; - border: 1px solid #42b9fe !important; - background: #42b9fe !important; + border: var(--gabinete-active-hove-box-border) !important; + background: var(--gabinete-active-hove-background) !important; box-sizing: border-box; .exp-card-content, .icon-selected{ diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d7e59ae2c..b3e14cc5f 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -375,12 +375,12 @@ $app-theme: mat-light-theme( } */ .item-hover:hover { - background-color: #e6f6ff75 !important; + background-color: var(--box-hover-background-color); } .box-hover:hover { - background-color: #e6f6ff75 !important; - border: 1px solid #42b9fe !important; + background-color: var(--box-hover-background-color) !important; + border: var(--box-hover-background-border-color) !important; } .Rectangle { @@ -633,10 +633,10 @@ body { --header-tab-text-white: rgb(0, 0, 0); --header-container-background: #fff; --header-bottom-line-background: rgb(255, 0, 0); - --header-bottom-line-background-image: linear-gradient(to right, #C63527, #FFB81C, #FFC72C); - --font-awesome: #FFB81C; + --header-bottom-line-background-image: linear-gradient(to right, #c63527, #ffb81c, #ffc72c); + --font-awesome: #ffb81c; - --color: #D9D9D9; + --color: #d9d9d9; --color2: #f0f0f0; --color3: #d9d9d9; --color4: #d9d9d9ee; @@ -647,6 +647,12 @@ body { --gabinete-title-container: #fff; --gabinete-main-container: #fff; + + --gabinete-active-hove-background: #C63527 !important; + --gabinete-active-hove-box-sizing: border-box; + + --box-hover-background-color: #e4e8eb75 !important; + --box-hover-background-border-color: 1px solid #ff4040 !important; } .default { @@ -678,9 +684,27 @@ body { var(--color5) 100% ) !important; - --header-container-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; - --header-bottom-line-background: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; - --header-bottom-line-background-image: linear-gradient(270deg, var(--color2) 0%, var(--color3) 23.44%, var(--color4) 78.13%, var(--color5) 100%) !important; + --header-container-background: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; + --header-bottom-line-background: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; + --header-bottom-line-background-image: linear-gradient( + 270deg, + var(--color2) 0%, + var(--color3) 23.44%, + var(--color4) 78.13%, + var(--color5) 100% + ) !important; --font-awesome: #42b9fe; --color: #0782c9; --color2: #45baff; @@ -693,9 +717,14 @@ body { --gabinete-title-container: #ecf8ff; --gabinete-main-container: #ecf8ff; -} + --gabinete-active-hove-background: #42b9fe; + --gabinete-active-hove-box-border: 1px solid #42b9fe; + + --box-hover-background-color: #e6f6ff75; + --box-hover-background-border-color: 1px solid #42b9fe; +} .font-awesome { color: var(--font-awesome) !important; -} \ No newline at end of file +} From 6d5c584104789e2107e6216df53a0030cb2c6252 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 25 Oct 2021 13:21:48 +0100 Subject: [PATCH 22/69] add icons --- .../document-viewer/document-viewer.page.html | 3 +- .../view-document/view-document.page.html | 4 +- .../emend-message-modal.page.html | 4 +- .../agenda/view-event/view-event.page.html | 3 +- .../chat/edit-group/edit-group.page.html | 3 +- .../group-contacts/group-contacts.page.html | 3 +- .../group-messages/group-messages.page.html | 10 ++-- .../chat/messages/contacts/contacts.page.html | 3 +- .../pages/chat/messages/messages.page.html | 8 ++- .../new-group/contacts/contacts.page.html | 3 +- .../pages/chat/new-group/new-group.page.html | 3 +- .../despacho-pr/despacho-pr.page.html | 3 +- .../despachos/despacho/despacho.page.html | 3 +- .../diploma-assinar/diploma-assinar.page.html | 3 +- .../diplomas/diploma/diploma.page.html | 3 +- .../approve-event-modal.page.html | 3 +- .../approve-event/approve-event.page.html | 3 +- .../event-list/event-list.page.html | 3 +- .../expediente-detail.page.html | 3 +- .../expediente/expediente.page.html | 3 +- .../expediente-pr/expediente-pr.page.html | 3 +- .../gabinete-digital.page.html | 3 +- .../pedidos/pedido/pedido.page.html | 3 +- .../publication-detail.page.html | 6 +- .../publication-detail.page.html | 6 +- .../view-publications.page.html | 3 +- .../organic-entity/organic-entity.page.html | 3 +- src/app/pages/search/sender/sender.page.html | 3 +- .../approve-event/approve-event.page.html | 3 +- .../approve-event/approve-event.page.ts | 4 +- .../btn-modal-dismiss.page.html | 3 +- .../btn-modal-dismiss.page.ts | 2 + .../chat/edit-group/edit-group.page.html | 3 +- .../shared/chat/edit-group/edit-group.page.ts | 2 + .../group-contacts/group-contacts.page.html | 3 +- .../group-contacts/group-contacts.page.ts | 2 + .../group-messages/group-messages.page.html | 5 +- .../chat/messages/contacts/contacts.page.html | 3 +- .../chat/messages/contacts/contacts.page.ts | 2 + .../shared/chat/messages/messages.page.html | 5 +- .../new-group/contacts/contacts.page.html | 3 +- .../chat/new-group/contacts/contacts.page.ts | 2 + .../task-details/task-details.page.html | 3 +- .../publication-detail.page.html | 6 +- .../publication-detail.page.ts | 2 + .../view-publications.page.ts | 5 +- src/assets/icon/theme/gov/icons-user.svg | 4 ++ .../theme/gov/icons-correspondencia.svg | 60 +++++++++++++++++++ 48 files changed, 175 insertions(+), 51 deletions(-) create mode 100644 src/assets/icon/theme/gov/icons-user.svg create mode 100644 src/assets/images/theme/gov/icons-correspondencia.svg diff --git a/src/app/modals/document-viewer/document-viewer.page.html b/src/app/modals/document-viewer/document-viewer.page.html index 78dd8f681..50abdcb04 100644 --- a/src/app/modals/document-viewer/document-viewer.page.html +++ b/src/app/modals/document-viewer/document-viewer.page.html @@ -3,7 +3,8 @@
- + +
{{ fileName }}
diff --git a/src/app/modals/view-document/view-document.page.html b/src/app/modals/view-document/view-document.page.html index 0dac8efec..8b95f6cd2 100644 --- a/src/app/modals/view-document/view-document.page.html +++ b/src/app/modals/view-document/view-document.page.html @@ -2,7 +2,7 @@
- +
@@ -10,7 +10,7 @@
- +
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index f4054a0d3..2641e0c53 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -2,7 +2,9 @@
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index ef098db37..697350915 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -15,7 +15,8 @@
diff --git a/src/app/pages/chat/edit-group/edit-group.page.html b/src/app/pages/chat/edit-group/edit-group.page.html index 7205ad17a..70817d9f6 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.html +++ b/src/app/pages/chat/edit-group/edit-group.page.html @@ -4,7 +4,8 @@
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index 263363b7d..dafbabf47 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -4,7 +4,8 @@
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 10dc91522..fd06b69a2 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -6,7 +6,7 @@
@@ -20,13 +20,14 @@
- + +
@@ -124,7 +125,8 @@
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 7ae952e46..576e531d5 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -4,7 +4,8 @@
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 90991514d..b81dad3f3 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -8,7 +8,7 @@
@@ -30,7 +30,8 @@