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 52e9e734e..8e56252a6 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 @@ -354,7 +354,7 @@
- +
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 43f05c650..c0614724e 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 @@ -14,9 +14,11 @@ color:#d30a0a !important; } .document-type{ - color: #d30a0a; - margin-left: 20px; - font-size: medium; + border-radius: 20px; + background: var(--label-bg-color); + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; } .btn-size{ font-size: rem(18) !important; 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 dbccafe51..c56ea9141 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -14,9 +14,11 @@ color:#d30a0a !important; } .document-type{ - color: #d30a0a; - margin-left: 20px; - font-size: medium; + border-radius: 20px; + background: var(--label-bg-color); + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; } .btn-size{ font-size: rem(18) !important; 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 a1397b0c6..1fe7aef89 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 @@ -72,7 +72,7 @@ -

{{ attachment.Assunto }} Rascunho

+

{{ attachment.Assunto }} Rascunho

{{ attachment.DocNumber }}

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

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 eccf42491..3f83be09b 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 @@ -13,6 +13,14 @@ ion-content, .header-2, .main-content{ padding: 30px 20px 0 20px !important; } +.document-type{ + border-radius: 20px; + background: var(--label-bg-color); + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; +} + .document-type{ color: #d30a0a; margin-left: 20px; 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 6506ece5a..4a8cb0a83 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -69,7 +69,7 @@ > -

{{ attachment.Assunto }} Rascunho

+

{{ attachment.Assunto }} Rascunho

{{ attachment.DocNumber }}

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

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 402f6b1c7..c44d22af2 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -17,10 +17,11 @@ font-size: rem(18) !important; } .document-type{ - color: #d30a0a; - margin-left: 20px; - font-size: medium; - font-size: rem(15); + border-radius: 20px; + background: var(--label-bg-color); + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; } .main-header{ overflow: inherit !important; diff --git a/version/git-version.ts b/version/git-version.ts index e9f368c57..147f5f70a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d96b5cfac", - "SHA": "d96b5cfacdf71129b3523da630c89049c67701d9", + "shortSHA": "02725cd36", + "SHA": "02725cd368ca72aa27e9399dd85c0423502192e5", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jul 15 11:39:30 2023 +0100'", + "lastCommitTime": "'Sat Jul 15 11:41:06 2023 +0100'", "lastCommitMessage": "merge", - "lastCommitNumber": "5080", + "lastCommitNumber": "5081", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html", - "changeAuthor": "peter.maquiran" + "changeStatus": "On branch developer-catch-merge\nYour branch is behind 'origin/developer-catch-merge' by 1 commit, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss", + "changeAuthor": "eudes.inacio" } \ No newline at end of file