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