diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 5d392ec15..a2a0eeaa5 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -931,7 +931,6 @@ $font-size: rem(15); margin-left: -100%; button { - // top: -35px; position: relative; color: transparent; background-color: transparent; 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 6c4cdbb55..4d187459b 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -10,6 +10,10 @@
{{ task.Folio }} + Para hoje + Nova
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 8376f7878..b332563d8 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -48,7 +48,7 @@
-
+
image
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 85ea6cd63..12283484b 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -108,9 +108,6 @@ export class TaskService { return false } - const deadline = new Date(isoDateString) - const plusOneDeadline = deadline.getDate() + 1 - deadline.setDate(plusOneDeadline) return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(isoDateString), 'dd MMMM yyyy') } 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 c36c0dbfd..2f6b4d610 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 @@ -1,5 +1,5 @@ - -
+ +
@@ -7,7 +7,7 @@
-
+
diff --git a/src/global.scss b/src/global.scss index 58ec95c9c..99cd58892 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1144,13 +1144,6 @@ background: rgb(92, 92, 92); } - -// angular material inputs - -.mat-form-field-infix, .mat-form-field-wrapper { - padding: 0px !important; -} - .select-calendar { .mat-form-field-infix { width: unset !important; @@ -1472,36 +1465,51 @@ $font-size: rem(15); width: 100%; } // date picker -ngx-mat-datetime-content .actions { - z-index: 1; - position: relative; - top: -66px; - margin-bottom: -44px; +// ngx-mat-datetime-content .actions { +// z-index: 1; +// position: relative; +// top: -66px; +// margin-bottom: -44px; - button { - z-index: 11111111; - } -} +// button { +// z-index: 11111111; +// } +// } -ngx-mat-datetime-content .ngx-mat-timepicker { - z-index: 111; -} -.mat-form-field-underline { - display: none !important; -} -ngx-mat-datetime-content .mat-input-element { - padding: 0px !important; -} +// ngx-mat-datetime-content .ngx-mat-timepicker { +// z-index: 111; +// } +// .mat-form-field-underline { +// display: none !important; +// } -ngx-mat-datetime-content{ - .actions { - .mat-button-disabled { - background-color: #ff5a5a59 !important; - } - } -} +// ngx-mat-datetime-content .mat-input-element { +// padding: 0px !important; +// } + + +// ngx-mat-datetime-content{ +// .actions { +// .mat-button-disabled { +// background-color: #ff5a5a59 !important; +// } +// } + +// } + + +// // angular material inputs + +// .mat-form-field-infix, .mat-form-field-wrapper { +// padding: 0px !important; +// } + + +// .mat-form-field-infix input { + +// } pre { diff --git a/version/git-version.ts b/version/git-version.ts index ac6604b5e..d6baf191d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "30aba9b18", - "SHA": "30aba9b182c15ea7321fc807156acacacc2d383e", + "shortSHA": "20c53993b", + "SHA": "20c53993bfe98bcea0e84b80dbede56f84a267a5", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 15 10:15:08 2023 +0100'", - "lastCommitMessage": "improve", - "lastCommitNumber": "5158", + "lastCommitTime": "'Tue Aug 15 12:03:37 2023 +0100'", + "lastCommitMessage": "update", + "lastCommitNumber": "5159", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/global.scss", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file