From d4f44cb4a983920a9a22178255cdeedd7061789e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 15:03:19 +0100 Subject: [PATCH 1/4] background --- src/app/pages/events/edit-event/edit-event.page.scss | 2 +- src/app/services/events/edit-event/edit-event.page.scss | 2 +- .../edit-event-to-approve/edit-event-to-approve.page.scss | 4 ++-- src/app/shared/agenda/edit-event/edit-event.page.scss | 2 +- .../edit-event-to-approve/edit-event.page.scss | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/pages/events/edit-event/edit-event.page.scss b/src/app/pages/events/edit-event/edit-event.page.scss index c19854413..4fa564390 100644 --- a/src/app/pages/events/edit-event/edit-event.page.scss +++ b/src/app/pages/events/edit-event/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/services/events/edit-event/edit-event.page.scss b/src/app/services/events/edit-event/edit-event.page.scss index c19854413..4fa564390 100644 --- a/src/app/services/events/edit-event/edit-event.page.scss +++ b/src/app/services/events/edit-event/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index 2073e52d8..6b06a4193 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -168,7 +168,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index 4ef1fdcce..d04552bf2 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -172,7 +172,7 @@ ion-content{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index 143d807e0..9d2c5aef8 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -105,7 +105,7 @@ .attach-title-item{ width: 100%; font-size: 15px; - color:#0d89d1; + color:var(--title-text-color); } /* SPAN */ .span-left{ @@ -168,7 +168,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; From a14a1aa46814a1e6061dea8e49a5c80d837feacb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 15:34:39 +0100 Subject: [PATCH 2/4] Improve --- src/app/shared/agenda/edit-event/edit-event.page.html | 1 + src/app/shared/agenda/edit-event/edit-event.page.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index f0a6432c6..a215c8d49 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -285,6 +285,7 @@ +
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 609cc47d9..0c25fa514 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -143,7 +143,7 @@ export class EditEventPage implements OnInit { } ngOnChanges(changes: any): void { - // this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) + this.loadedEventAttachments = this.loadedEventAttachments.concat(this.postEvent.Attachments) } close() { From 1801ea9b6abdc5a465224cf171466b45aa7dbc19 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 16:07:01 +0100 Subject: [PATCH 3/4] Improve --- .../modals/create-process/create-process.page.scss | 2 ++ .../document-set-up-meeting.page.scss | 2 ++ .../pages/agenda/edit-event/edit-event.page.scss | 2 ++ src/app/pages/agenda/new-event/new-event.page.scss | 1 + .../approve-event-modal.page.scss | 14 ++++++++------ .../book-meeting-modal.page.scss | 1 + .../expedient-task-modal.page.scss | 1 + .../edit-event-to-approve.page.scss | 1 + .../shared/agenda/edit-event/edit-event.page.scss | 2 ++ .../shared/agenda/new-event/new-event.page.scss | 1 + .../edit-event-to-approve/edit-event.page.scss | 1 + 11 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index c557abb39..272d39b0a 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -133,6 +133,7 @@ .close-button { display: none; + height: 20px; } @@ -144,6 +145,7 @@ .close-button { display: block !important; + height: 20px; } } diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss index d3709536d..6f8e92996 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -194,6 +194,7 @@ .close-button { display: none; + height: 20px; } @@ -205,6 +206,7 @@ .close-button { display: block !important; + height: 20px; } } \ No newline at end of file diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index 49c63f67d..d4d458299 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -188,6 +188,7 @@ .close-button { display: none; + height: 20px; } @@ -199,5 +200,6 @@ .close-button { display: block !important; + height: 20px; } } \ No newline at end of file diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index bcebc9bd3..32661e0e6 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -199,6 +199,7 @@ ion-content{ .close-button { display: none; + height: 20px; } 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 347959730..ca453b2a7 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 @@ -163,18 +163,20 @@ ion-menu{ .close-button { display: none; +height: 20px; } .list:hover { -.app-name { - display: none; -} + .app-name { + display: none; + } -.close-button { - display: block !important; -} + .close-button { + display: block !important; + height: 20px; + } } .attach-title-item{ diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index b3bd9e3ef..3cf19e5e9 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -193,6 +193,7 @@ .close-button { display: none; + height: 20px; } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 29fe12990..d2ead195f 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -173,6 +173,7 @@ font-size: 13px; .close-button { display: none; + height: 20px; } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss index 6b06a4193..1785b7fb2 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss @@ -187,6 +187,7 @@ .close-button { display: none; + height: 20px; } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss index d04552bf2..a9fe5b41b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.scss +++ b/src/app/shared/agenda/edit-event/edit-event.page.scss @@ -191,6 +191,7 @@ ion-content{ .close-button { display: none; + height: 20px; } .list:hover { @@ -201,6 +202,7 @@ ion-content{ .close-button { display: block !important; + height: 20px; } } diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index b0b302e16..8e09e036d 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -199,6 +199,7 @@ .close-button { display: none; + height: 20px; } .list:hover { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index 9d2c5aef8..c43334586 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -187,6 +187,7 @@ .close-button { display: none; + height: 20px; } From f645256388575926d44918426e0124e3a9599962 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 7 Dec 2021 17:25:04 +0100 Subject: [PATCH 4/4] Fix visual bug --- src/app/modals/create-process/create-process.page.scss | 2 +- .../document-set-up-meeting/document-set-up-meeting.page.scss | 2 +- src/app/pages/agenda/edit-event/edit-event.page.scss | 2 +- src/app/pages/agenda/new-event/new-event.page.scss | 2 +- .../approve-event-modal/approve-event-modal.page.scss | 2 +- .../book-meeting-modal/book-meeting-modal.page.scss | 2 +- .../expedient-task-modal/expedient-task-modal.page.scss | 4 ++-- src/app/shared/agenda/new-event/new-event.page.scss | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 272d39b0a..f2b91b59a 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -151,7 +151,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss index 6f8e92996..0b163bcef 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -175,7 +175,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index d4d458299..872268000 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -169,7 +169,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 32661e0e6..905df261e 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/src/app/pages/agenda/new-event/new-event.page.scss @@ -180,7 +180,7 @@ ion-content{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; 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 ca453b2a7..30a0b66e6 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 @@ -144,7 +144,7 @@ ion-menu{ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 3cf19e5e9..a27d6e083 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -174,7 +174,7 @@ .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index d2ead195f..779ab1a8b 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -154,7 +154,7 @@ font-size: 13px; .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; @@ -190,7 +190,7 @@ font-size: 13px; .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex; diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss index 8e09e036d..3a2b56399 100644 --- a/src/app/shared/agenda/new-event/new-event.page.scss +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -180,7 +180,7 @@ } .app-name{ - background: #42b9f2; + background: var(--title-text-color); border-radius: 18px; text-align: center; display: flex;