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 a485b69c5..9f59f72d0 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -6,7 +6,7 @@ logo -
+
@@ -36,7 +36,7 @@
- +
@@ -47,13 +47,13 @@
- +
-
+ -
-
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index bc73f7e72..937def0e4 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -6,7 +6,7 @@ logo
-
+
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 23cf62d3b..f8dd72530 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 @@ -5,7 +5,7 @@
- +
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 0e22a2fe3..4950fea29 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 @@ -27,7 +27,7 @@ - Adicionar Nota + Rever @@ -77,24 +77,24 @@
-
+
Documentos Anexados
- -

- {{document.SourceName}} +

+ {{document.SourceName}} Correspondencia AccoesPresidenciais ArquivoDespachoElect -

+

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}}

-
+
@@ -122,7 +122,7 @@ -->
- +
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 0f3428793..71f3bd2f2 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 @@ -93,7 +93,7 @@
- +
@@ -105,7 +105,7 @@
- + 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 84053af6c..f8a57ae31 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -31,7 +31,7 @@
@@ -41,18 +41,18 @@

{{loadedEvent.workflowInstanceDataFields.Location}} - - {{loadedEvent.workflowInstanceDataFields.Agenda}} + + {{loadedEvent.workflowInstanceDataFields.Agenda}} - + {{loadedEvent.workflowInstanceDataFields.Agenda}} - + {{loadedEvent.workflowInstanceDataFields.Agenda}} - + {{loadedEvent.workflowInstanceDataFields.Agenda}} @@ -69,7 +69,7 @@

- +
@@ -87,12 +87,12 @@
- +
Documentos Anexados

{{attach.SourceName}}

@@ -101,7 +101,7 @@
- +
@@ -111,7 +111,7 @@
- +
@@ -123,7 +123,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 a0561c0c2..e75bd5c5d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -32,12 +32,11 @@ ion-menu{ padding: 30px 20px 0 20px !important; overflow: auto; width: 100%; - border-right: 1px solid #d8d8d8; .upper-content{ margin-left: 40px; font-size: 18px; - + .content-location{ margin-top: 0px !important; width: 100%; @@ -79,10 +78,10 @@ ion-menu{ font-size: 16px; } } - + .bottom-content{ margin: 0 auto; - + .bottom-content h3{ font-size: 16px; margin: 0 0 0 10px; @@ -119,12 +118,12 @@ ion-menu{ .aside-right{ overflow: auto; padding: 30px 20px 0 20px !important; - + .arrow-right{ display: flex; justify-content: flex-end; margin-bottom: 20px; - + /* .arrow-right-icon{ width: 37px; float: right; @@ -137,7 +136,7 @@ ion-menu{ display: flex; flex-wrap: wrap; justify-content: space-between; - + .btn-ok, .btn-cancel, .btn-delete{ height: auto !important; font-size: 16px !important; @@ -162,7 +161,7 @@ ion-menu{ justify-content: space-between; overflow: auto; padding: 5px; - + .button-options { height: 44px; --color: #42b9fe; @@ -202,12 +201,12 @@ ion-menu{ //width: 75%; border-right: 1px solid #d8d8d8; } - + .aside-right{ width: 25%; } } */ - + .delete{ @@ -216,4 +215,4 @@ ion-menu{ color:#fff; background: #d30606; border-radius: 20px; -} \ No newline at end of file +} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 06f7d8ceb..b7b9788f3 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -402,22 +402,22 @@ $app-theme: mat-light-theme(( overflow: auto; } -.item-conten-agenda-oficial-100000011 { +.item-conten-agenda-Oficial-100000011 { border-radius: 5px; border-right: 5px solid #ffb703; } -.item-conten-agenda-pessoal-100000011 { +.item-conten-agenda-Pessoal-100000011 { border-radius: 5px; border-right: 5px solid #ff0303; } -.item-conten-agenda-oficial-100000014 { +.item-conten-agenda-Oficial-100000014 { border-radius: 5px; border-right: 5px solid #03d838; } -.item-conten-agenda, .item-conten-pessoal, .item-conten-100000014 { +.item-conten-agenda-Pessoal-100000014 { border-radius: 5px; border-right: 5px solid #8b0ae0; }