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 be1b03ade..5bf1e4c7f 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
@@ -351,7 +351,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 17366ffb0..6b3c952fb 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/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
index a69b884f8..f535c6d5f 100644
--- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
+++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html
@@ -8,7 +8,7 @@
-
+
diff --git a/src/assets/images/error_circle_warning.png b/src/assets/images/error_circle_warning.png
new file mode 100644
index 000000000..a3d952cca
Binary files /dev/null and b/src/assets/images/error_circle_warning.png differ
diff --git a/version/git-version.ts b/version/git-version.ts
index fc3ce7a1e..91945d8c8 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "4d7c80a73",
- "SHA": "4d7c80a739c13184c1b8769a41cd16ea7c180b7c",
+ "shortSHA": "65a67902d",
+ "SHA": "65a67902d43d9ee65d9a8b323b926b96a6085904",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Thu Jul 20 16:54:58 2023 +0100'",
+ "lastCommitTime": "'Fri Jul 21 10:12:55 2023 +0100'",
"lastCommitMessage": "fix",
- "lastCommitNumber": "5087",
+ "lastCommitNumber": "5088",
"change": "",
- "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts",
+ "changeStatus": "On branch developer-catch-merge\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/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tnew file: src/assets/images/error_circle_warning.png\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file