From 032042635ddff8905989d1f5547679d5475b722a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 25 Oct 2021 15:31:43 +0100 Subject: [PATCH] Fix --- .../chat-options-features/chat-options-features.page.html | 3 ++- .../chat-options-features/chat-options-features.page.scss | 2 +- .../chat-options-features/chat-options-features.page.ts | 1 + .../event-actions-popover/event-actions-popover.page.html | 3 ++- .../event-actions-popover/event-actions-popover.page.ts | 4 +++- .../pages/gabinete-digital/despachos/despachos.page.html | 2 +- .../diploma-assinar/diploma-assinar.page.ts | 1 - .../approve-event-modal/approve-event-modal.page.html | 3 ++- .../event-list/approve-event/approve-event.page.html | 3 ++- src/app/pages/publications/publications.page.html | 8 ++++++-- .../shared/agenda/approve-event/approve-event.page.html | 4 +++- .../shared/btn-modal-dismiss/btn-modal-dismiss.page.html | 2 +- .../popover/actions-options/actions-options.page.html | 3 ++- .../popover/actions-options/actions-options.page.ts | 4 +++- .../chat-options-popover/chat-options-popover.page.html | 3 ++- .../chat-options-popover/chat-options-popover.page.ts | 2 ++ .../shared/popover/chat-popover/chat-popover.page.html | 3 ++- .../shared/popover/chat-popover/chat-popover.page.scss | 2 +- src/app/shared/popover/chat-popover/chat-popover.page.ts | 3 +++ .../popover/despachos-options/despachos-options.page.html | 3 ++- .../popover/despachos-options/despachos-options.page.ts | 2 ++ .../despachos-pr-options/despachos-pr-options.page.html | 3 ++- .../despachos-pr-options/despachos-pr-options.page.ts | 3 +++ .../popover/messages-options/messages-options.page.html | 3 ++- .../popover/messages-options/messages-options.page.ts | 3 +++ .../opts-expediente-pr/opts-expediente-pr.page.html | 3 ++- .../popover/opts-expediente-pr/opts-expediente-pr.page.ts | 3 +++ .../popover/opts-expediente/opts-expediente.page.html | 3 ++- .../popover/opts-expediente/opts-expediente.page.ts | 5 ++++- src/theme/variables.scss | 6 +++--- 30 files changed, 67 insertions(+), 26 deletions(-) diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html index 75ac2594a..848e950fa 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ b/src/app/modals/chat-options-features/chat-options-features.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss index 86ac0ae4b..50f7690d2 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.scss +++ b/src/app/modals/chat-options-features/chat-options-features.page.scss @@ -39,7 +39,7 @@ width: 100% !important; } .btn-cancel:hover{ - background-color: #42b9fe; + background-color: var(--button-hover); color: #fff !important; } .mobile-only{ diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index f10cc16cc..e9ebdc9c6 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -9,6 +9,7 @@ import { ChatService } from 'src/app/services/chat.service'; import { FileLoaderService } from 'src/app/services/file/file-loader.service'; import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; import { environment } from 'src/environments/environment'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-chat-options-features', diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index ca44e45ca..ccdf3a347 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 6294005fd..0153fbd95 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -8,6 +8,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page'; import { Location } from '@angular/common'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-event-actions-popover', @@ -26,7 +27,8 @@ export class EventActionsPopoverPage implements OnInit { private popoverController: PopoverController, private animationController: AnimationController, private toastService: ToastService, - private location: Location) { + private location: Location, + public ThemeService: ThemeService) { this.serialNumber = this.navParams.get('serialNumber'); this.instanceId = this.navParams.get('InstanceId'); } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index f8df32bb7..24f45b51f 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -24,7 +24,7 @@ pullingText="deslize para actualizar" refreshingSpinner="circles" refreshingText="A actualizar..."> - +
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index b4fa28380..270c49bca 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { AnimationController, ModalController, PopoverController } from '@ionic/angular'; -import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { ProcessesService } from 'src/app/services/processes.service'; import { momentG } from 'src/plugin/momentG'; diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index 5c2977042..418781d21 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -10,7 +10,8 @@
- + +
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 a9f9cf1d3..28bbc19a8 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 @@ -14,7 +14,8 @@
- + +
@@ -96,7 +98,9 @@ diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 2cdca3245..131fe4cbe 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -27,7 +27,9 @@
diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html index 124c58b0d..c984dc2d8 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page.html @@ -1,6 +1,6 @@
diff --git a/src/app/shared/popover/actions-options/actions-options.page.html b/src/app/shared/popover/actions-options/actions-options.page.html index efc6d9a54..939b76589 100644 --- a/src/app/shared/popover/actions-options/actions-options.page.html +++ b/src/app/shared/popover/actions-options/actions-options.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/actions-options/actions-options.page.ts b/src/app/shared/popover/actions-options/actions-options.page.ts index a6d49096d..eaec50b46 100644 --- a/src/app/shared/popover/actions-options/actions-options.page.ts +++ b/src/app/shared/popover/actions-options/actions-options.page.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams } from '@ionic/angular'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-actions-options', @@ -16,7 +17,8 @@ export class ActionsOptionsPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private publicationsService: PublicationsService, - private toastService: ToastService + private toastService: ToastService, + public ThemeService: ThemeService ) { this.id = this.navParams.get('id'); } diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 924b96c3a..a0042f5a1 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 27df26c1e..c0d566d76 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -6,6 +6,7 @@ import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AlertService } from 'src/app/services/alert.service'; import { environment } from 'src/environments/environment'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-chat-options-popover', @@ -23,6 +24,7 @@ export class ChatOptionsPopoverPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private navParams: NavParams, + public ThemeService: ThemeService ) { this.members = this.navParams.get('members'); diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index d402757a7..d85351acb 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss index 042f5c444..738f71a16 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.scss +++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss @@ -37,7 +37,7 @@ margin-bottom: 10px !important; } .btn-cancel:hover, .btn-delete:hover{ - background-color: #42b9fe; + background-color: var(--button-hover); color: #fff !important; } .btn-ok{ diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 20ee26e35..81bbf3cc3 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; import { ToastService } from 'src/app/services/toast.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-chat-popover', @@ -18,6 +20,7 @@ export class ChatPopoverPage implements OnInit { private navParams: NavParams, private chatService: ChatService, private toastService: ToastService, + public ThemeService: ThemeService ) { this.roomId = this.navParams.get('roomId'); } diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html index 0bc89a61c..1a33fae72 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.html +++ b/src/app/shared/popover/despachos-options/despachos-options.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 6b5a011da..b1d62bbc8 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -10,6 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { ToastService } from 'src/app/services/toast.service'; import { customTask, fullTask } from 'src/app/models/dailyworktask.model'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ @@ -31,6 +32,7 @@ export class DespachosOptionsPage implements OnInit { private navParams: NavParams, private toastService: ToastService, public p: PermissionService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task') this.fulltask = this.navParams.get('fulltask') diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html index fdf88d42e..f46731c61 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index a210f4ae9..5ba9b2902 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -10,6 +10,8 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common' import { PermissionService } from 'src/app/services/worker/permission.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-despachos-pr-options', @@ -33,6 +35,7 @@ export class DespachosPrOptionsPage implements OnInit { private toastService: ToastService, private location: Location, public p: PermissionService, + public ThemeService: ThemeService ) { } ngOnInit() { diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html index 98acbea72..7150aa3fd 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.html +++ b/src/app/shared/popover/messages-options/messages-options.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts index c6d3340b0..2de44a93d 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.ts +++ b/src/app/shared/popover/messages-options/messages-options.page.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ChatService } from 'src/app/services/chat.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-messages-options', @@ -16,6 +18,7 @@ export class MessagesOptionsPage implements OnInit { private modalController: ModalController, private chatService: ChatService, private navParams: NavParams, + public ThemeService: ThemeService ) { this.roomId = this.navParams.get('roomId'); diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html index 42e0c57a3..d4515ed1b 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html @@ -2,7 +2,8 @@
diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 42108f04c..35a192b50 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -13,6 +13,8 @@ import { AuthService } from 'src/app/services/auth.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common' +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-opts-expediente-pr', @@ -49,6 +51,7 @@ export class OptsExpedientePrPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, private location: Location, + public ThemeService: ThemeService ) { diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index 298db9f25..dc04af69d 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -1,7 +1,8 @@
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 28c7cef69..17d9f16b8 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -16,6 +16,8 @@ import { Location } from '@angular/common'; import { TaskService } from 'src/app/Rules/task.service' import { ExpedienteService } from 'src/app/Rules/expediente.service'; import { PermissionService } from 'src/app/services/worker/permission.service'; +import { ThemeService } from 'src/app/services/theme.service' + @Component({ selector: 'app-opts-expediente', @@ -45,7 +47,8 @@ export class OptsExpedientePage implements OnInit { private attachmentsService: AttachmentsService, private location: Location, private TaskService: TaskService, - private expedienteService: ExpedienteService + private expedienteService: ExpedienteService, + public ThemeService: ThemeService ) { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); diff --git a/src/theme/variables.scss b/src/theme/variables.scss index c75f30f89..8e531f472 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -536,7 +536,7 @@ $app-theme: mat-light-theme( height: 45px !important; padding: 0 !important; border-radius: 22.5px; - background-color: #e0e9ee; + background-color: #ffb703; color: #061b52 !important; margin: 0 auto !important; } @@ -619,7 +619,7 @@ body { .gov { --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; - --button-hover: #ffb81c; + --button-hover: #c63527; --inicio-open-page-from-box: #c63527; --header-tab-top-border: #000; @@ -660,7 +660,7 @@ body { .default { --login-background: linear-gradient(180deg, #42b9fe 0%, #0782c9 100%) !important; - --button-hover: #bfcbd1; + --button-hover: #42b9fe; --inicio-open-page-from-box: #42b9fe; --header-tab-top-border: white;