diff --git a/src/app/modals/document-viewer/document-viewer.page.html b/src/app/modals/document-viewer/document-viewer.page.html index 50abdcb04..0bc9e4ef2 100644 --- a/src/app/modals/document-viewer/document-viewer.page.html +++ b/src/app/modals/document-viewer/document-viewer.page.html @@ -4,6 +4,7 @@
+
diff --git a/src/app/modals/preview-camera/preview-camera.page.html b/src/app/modals/preview-camera/preview-camera.page.html index f4a96098a..713edaa99 100644 --- a/src/app/modals/preview-camera/preview-camera.page.html +++ b/src/app/modals/preview-camera/preview-camera.page.html @@ -5,7 +5,8 @@
- + +
{{name}}
diff --git a/src/app/modals/preview-camera/preview-camera.page.ts b/src/app/modals/preview-camera/preview-camera.page.ts index 3f16ae5a5..e0c000ea5 100644 --- a/src/app/modals/preview-camera/preview-camera.page.ts +++ b/src/app/modals/preview-camera/preview-camera.page.ts @@ -6,6 +6,7 @@ import { GroupIconsPage } from '../group-icons/group-icons.page'; import { Share } from '@capacitor/share'; import { Router } from '@angular/router'; import { Directory, Filesystem } from '@capacitor/filesystem'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-preview-camera', @@ -17,7 +18,8 @@ export class PreviewCameraPage implements OnInit { constructor( private modalController: ModalController, private navParams:NavParams, public router: Router, - private publicService: PublicationsService) { } + private publicService: PublicationsService, + public ThemeService: ThemeService,) { } @ViewChild(IonSlides) slides : IonSlides 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 b9b12f018..e82845b3c 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -88,6 +88,10 @@
+
+ DoneIt +
+ diff --git a/src/app/modals/set-room-owner/set-room-owner.page.html b/src/app/modals/set-room-owner/set-room-owner.page.html index a6d13bec1..c1564c44d 100644 --- a/src/app/modals/set-room-owner/set-room-owner.page.html +++ b/src/app/modals/set-room-owner/set-room-owner.page.html @@ -3,7 +3,9 @@
+ diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html index 0a8e13f7f..fba414a85 100644 --- a/src/app/modals/view-event/view-event.page.html +++ b/src/app/modals/view-event/view-event.page.html @@ -15,6 +15,7 @@
diff --git a/src/app/modals/view-event/view-event.page.scss b/src/app/modals/view-event/view-event.page.scss index acc6321ca..c23d2ca98 100644 --- a/src/app/modals/view-event/view-event.page.scss +++ b/src/app/modals/view-event/view-event.page.scss @@ -120,7 +120,7 @@ ion-menu{ .button-mdgpr-Oficial{ width: 91px; --border-radius: 20px; - --background: #ffb703; + --background: var(--label-bg-color); margin-left: 5px; float: left; } @@ -294,7 +294,7 @@ ion-menu{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; 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 37eeaa3d5..45b2646fd 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,6 +2,7 @@
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 79c94b3dd..999227189 100644 --- a/src/app/pages/agenda/view-event/view-event.page.scss +++ b/src/app/pages/agenda/view-event/view-event.page.scss @@ -120,7 +120,7 @@ ion-menu{ .button-mdgpr-Oficial{ width: 91px; --border-radius: 20px; - --background: #ffb703; + --background: var(--label-bg-color); margin-left: 5px; float: left; } @@ -294,7 +294,7 @@ ion-menu{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; 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 00bbea785..352f84d7b 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 @@ -5,6 +5,7 @@
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html index 5fbf7b24b..4158db867 100644 --- a/src/app/pages/chat/messages/contacts/contacts.page.html +++ b/src/app/pages/chat/messages/contacts/contacts.page.html @@ -5,6 +5,7 @@
diff --git a/src/app/pages/chat/new-group/contacts/contacts.page.html b/src/app/pages/chat/new-group/contacts/contacts.page.html index 59be5dfab..1d146e957 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.page.html +++ b/src/app/pages/chat/new-group/contacts/contacts.page.html @@ -5,6 +5,7 @@
diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html index b6b7a0690..9cf9932ed 100644 --- a/src/app/pages/chat/new-group/new-group.page.html +++ b/src/app/pages/chat/new-group/new-group.page.html @@ -5,6 +5,7 @@
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index f60b7f16d..f38f4caad 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -49,6 +49,14 @@ src="assets/images/theme/gov/icons-arrow-circle-arrow-right.svg" > + + + + +
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss index 53a90b9b7..0ad45013c 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss @@ -101,7 +101,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss index f10e7a082..8b1fa1eaf 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -192,7 +192,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; 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 5c69099f7..3d62f5b31 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -9,6 +9,7 @@
+
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss index ddae3b550..bf2144bc2 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -60,7 +60,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index a4421e515..0de25249d 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -173,7 +173,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 022fd0c0b..773282f43 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -9,6 +9,7 @@
+
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss index 69e728cfa..47b8d66dd 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss @@ -120,7 +120,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index 76990574b..e3ae39439 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -182,7 +182,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss index a4421e515..0de25249d 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss @@ -173,7 +173,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index a1fce51d3..f2db050cc 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -11,6 +11,7 @@
+
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss index 69e728cfa..47b8d66dd 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss @@ -120,7 +120,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; 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 4f6a6ca7c..b426eb629 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -9,6 +9,7 @@
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss index 5a5cbcc77..a51ce3e25 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -102,7 +102,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss index 129ce6c1f..121695281 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.scss @@ -172,7 +172,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; 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 da328786f..3e93eb3db 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 @@ -3,6 +3,7 @@
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 30a0b66e6..a161e866b 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 @@ -49,7 +49,7 @@ ion-menu{ .button-calendar-type{ width: 91px; --border-radius: 12.5px; - --background: #ffb703; + --background: var(--label-bg-color); margin-left: 5px; float: left; } 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 195d17574..a3efe7256 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 @@ -19,6 +19,7 @@
+
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 3c1936fde..1b20eb1ce 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 @@ -58,7 +58,7 @@ ion-menu{ .event-type-Oficial{ font-family: Roboto; border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right !important; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index cb11441d9..851b07e8c 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -7,6 +7,7 @@
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 97121dcc7..1d0a71852 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 @@ -13,6 +13,7 @@
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 8855cc71b..43e56c179 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -100,7 +100,7 @@ ion-button{ .label{ border-radius: 20px; - //background: #ffb703; + //background: var(--label-bg-color); background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 7221de123..f989f787d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -8,6 +8,7 @@
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index f5085216c..6a8675ebd 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -167,13 +167,17 @@ ion-item{ float: left; margin: 0 !important; - .label{ + .label { border-radius: 15px; - background: #ffb703; - /* font-size: 12px; */ - float: right; + background: var(--label-bg-color); + /*font-size: 12px; + */float: right; padding: 2.5px 13.5px 2.5px 13.5px; color: #fff; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + -ms-border-radius: 15px; + -o-border-radius: 15px; } } .exp-date{ 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 6f023e836..1d2c86be3 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 @@ -13,6 +13,7 @@
+
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss index 763ad1941..46df34636 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss @@ -100,7 +100,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss index e8032a26c..2f5b5b8d4 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss @@ -171,7 +171,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index ac142e8a0..f576bd6b2 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -163,6 +163,7 @@
+ @@ -173,6 +174,7 @@
+ @@ -185,6 +187,7 @@
+ @@ -194,8 +197,9 @@

{{despachoStore.count}} Documentos

-
+
+ @@ -208,6 +212,7 @@
+ 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 5d2d76ee3..c183c94b2 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -9,6 +9,7 @@
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 3be2de130..4241aa5ec 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -66,7 +66,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss index ed46e7f05..76a3def57 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss @@ -170,7 +170,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index d1de562e8..94990800b 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -172,7 +172,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html index d778e071d..5972a1a12 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/publication-detail/publication-detail.page.html @@ -6,6 +6,7 @@
+
@@ -34,6 +35,7 @@
+
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index 7b06bd70d..2d0baf161 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -13,6 +13,7 @@
+
@@ -38,6 +39,7 @@
+
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 8ed7372e8..da24e9228 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -8,6 +8,7 @@
+
diff --git a/src/app/pages/search/organic-entity/organic-entity.page.html b/src/app/pages/search/organic-entity/organic-entity.page.html index 370fe9c6a..4dd96ae76 100644 --- a/src/app/pages/search/organic-entity/organic-entity.page.html +++ b/src/app/pages/search/organic-entity/organic-entity.page.html @@ -8,6 +8,7 @@
+
diff --git a/src/app/services/events/events.page.html b/src/app/services/events/events.page.html index 4fb2378e8..463004977 100644 --- a/src/app/services/events/events.page.html +++ b/src/app/services/events/events.page.html @@ -39,6 +39,14 @@ class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" + *ngIf="ThemeService.currentTheme != 'doneIt' " + > + + +
diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts index 80e67ff11..22affd076 100644 --- a/src/app/services/events/events.page.ts +++ b/src/app/services/events/events.page.ts @@ -14,6 +14,7 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { SessionStore } from 'src/app/store/session.service'; +import { ThemeService } from 'src/app/services/theme.service'; @Component({ selector: 'app-events', @@ -80,6 +81,7 @@ export class EventsPage implements OnInit { private modalController:ModalController, private screenOrientation: ScreenOrientation, public platform: Platform, + public ThemeService: ThemeService, ) { this.existingScreenOrientation = this.screenOrientation.type; diff --git a/src/app/services/theme.service.ts b/src/app/services/theme.service.ts index 960033b3f..0f3ae20f8 100644 --- a/src/app/services/theme.service.ts +++ b/src/app/services/theme.service.ts @@ -10,10 +10,11 @@ export class ThemeService { themes = [ 'gov', 'default', - 'tribunal' + 'tribunal', + 'doneIt' ] - currentTheme: 'gov' | 'default' | 'tribunal' = 'gov' + currentTheme: 'gov' | 'default' | 'tribunal' | 'doneIt' = 'gov' keyName: string constructor( @@ -35,6 +36,7 @@ export class ThemeService { document.body.classList.remove("gov"); document.body.classList.remove("default"); document.body.classList.remove("tribunal"); + document.body.classList.remove("doneIt"); document.body.classList.add(theme); this.currentTheme = theme; 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 33d8046d3..7b75ec450 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -19,6 +19,7 @@
+
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss index ef234d200..5866fc140 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -51,7 +51,7 @@ .event-type-Oficial{ font-family: Roboto; border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right !important; padding: 5px 13.5px 5px 13.5px; color: #fff; 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 a9ce19c12..dc8dd0c24 100644 --- a/src/app/shared/agenda/event-list/event-list.page.scss +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -48,7 +48,7 @@ } .event-mdgpr-Oficial{ border-radius: 5px; - border-right: 5px solid #ffb703; + border-right: 5px solid var(--label-bg-color); overflow: auto; } .event-mdgpr-Pessoal{ diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index 3de94031a..69450e406 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -112,7 +112,7 @@ ion-content{ .label{ width: fit-content; border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right !important; padding: 5px 13.5px 5px 13.5px; color: #fff; 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 c984dc2d8..b3494c7e4 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,7 @@
diff --git a/src/app/shared/chat/edit-group/edit-group.page.html b/src/app/shared/chat/edit-group/edit-group.page.html index 5de4ba1db..75532b7e5 100644 --- a/src/app/shared/chat/edit-group/edit-group.page.html +++ b/src/app/shared/chat/edit-group/edit-group.page.html @@ -5,6 +5,7 @@
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index fa3f46fe3..882b0c426 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -5,6 +5,7 @@
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html index f5e7824f7..11b11f721 100644 --- a/src/app/shared/chat/messages/contacts/contacts.page.html +++ b/src/app/shared/chat/messages/contacts/contacts.page.html @@ -4,6 +4,7 @@
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss index 84fb46129..ca27d8432 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -176,7 +176,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss index 3c095e7f0..193e35618 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss @@ -157,7 +157,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index 8d76ee6cd..14a992c15 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -177,7 +177,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss index 8d76ee6cd..14a992c15 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss @@ -177,7 +177,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss index 6f388901b..a238b635c 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss +++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.scss @@ -98,7 +98,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); //font-size: 12px; float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss index ddde8b525..f16a177d3 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss @@ -166,7 +166,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; 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 27d2cbb71..39ddfe79c 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 @@ -42,7 +42,7 @@ } .event-mdgpr-Oficial{ border-radius: 5px; - border-right: 5px solid #ffb703; + border-right: 5px solid var(--label-bg-color); overflow: auto; } .event-mdgpr-Pessoal{ @@ -161,7 +161,7 @@ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss index 6f388901b..a238b635c 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss @@ -98,7 +98,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); //font-size: 12px; float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.scss b/src/app/shared/gabinete-digital/expedients/expedients.page.scss index 6f388901b..a238b635c 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.scss +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.scss @@ -98,7 +98,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); //font-size: 12px; float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss index 9235ed78a..e487210a4 100644 --- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss @@ -60,7 +60,7 @@ ion-button{ .label{ border-radius: 20px; - background: #ffb703; + background: var(--label-bg-color); float: right; padding: 5px 13.5px 5px 13.5px; color: #fff; diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss index 0fcd7aa44..fcf4c7c13 100644 --- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss +++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss @@ -61,7 +61,7 @@ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss index 87ba12f6b..90a4be095 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss @@ -165,7 +165,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss index 4406e6541..3fd913976 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.scss @@ -160,7 +160,7 @@ ion-item{ .label{ border-radius: 15px; - background: #ffb703; + background: var(--label-bg-color); /* font-size: 12px; */ float: right; padding: 2.5px 13.5px 2.5px 13.5px; diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index f0234d2e7..e2ea662e1 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -5,7 +5,8 @@ -
+

GABINETE DIGITAL

@@ -33,7 +34,8 @@
{{notificationLength}}
- + +
@@ -43,14 +45,14 @@