From 2def687fa30799468fdda5ac5723462bddc164b9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 19 May 2023 13:01:10 +0100 Subject: [PATCH] alignmente --- .../despacho-pr/despacho-pr.page.scss | 2 +- .../despachos/despacho/despacho.page.scss | 2 +- .../diploma-assinar/diploma-assinar.page.scss | 2 +- .../diplomas-gerar/diplomas-gerar.page.scss | 2 +- .../diplomas/diploma/diploma.page.scss | 2 +- .../expediente-detail.page.scss | 2 +- .../expediente-pr/expediente-pr.page.scss | 2 +- .../gabinete-digital.page.html | 23 +++++++++++++------ .../gabinete-digital.page.scss | 9 ++++++++ .../gabinete-digital/gabinete-digital.page.ts | 2 +- .../pedidos/pedido/pedido.page.scss | 2 +- src/global.scss | 8 +++++++ version/git-version.ts | 12 +++++----- 13 files changed, 48 insertions(+), 22 deletions(-) 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 0ad45013c..005a549ec 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 @@ -96,7 +96,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ 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 bf2144bc2..ff9d8918c 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss @@ -55,7 +55,7 @@ ion-button{ .upper-content{ font-family: Roboto; margin-top: 15px; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ 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 47b8d66dd..2199028ff 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 @@ -115,7 +115,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss index 47b8d66dd..2199028ff 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss @@ -115,7 +115,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ 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 a51ce3e25..59b101ac1 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss @@ -97,7 +97,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 43e56c179..7e579fcf7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -95,7 +95,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss index 46df34636..b603df196 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss @@ -95,7 +95,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index c186b27ba..eef89ac11 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -48,21 +48,30 @@
- - + + +
+
+ +
+
+ +
+
-
+
-
+
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 9596712e2..86da78e37 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -721,4 +721,13 @@ ion-content{ .activeTab { color: #cf1521; +} + + + +ion-segment-button { + width: 27px; + height: 11px; + min-width: 27px; + min-height: 27px; } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d31c52eea..0ad5a10b7 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -97,7 +97,7 @@ export class GabineteDigitalPage implements OnInit { filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' hideSearchBtn: boolean = false; - showSearch = false; + showSearch = true; searchSubject: string = ''; AllProcess = [] diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 4241aa5ec..38ea4af3b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -61,7 +61,7 @@ ion-button{ .upper-content{ font-family: Roboto; - margin-left: 41px; + margin-left: 36px; font-size: 18px; .label{ diff --git a/src/global.scss b/src/global.scss index 39f569efb..ff69700ae 100644 --- a/src/global.scss +++ b/src/global.scss @@ -885,6 +885,14 @@ ion-icon{ } +@media only screen and (max-width: 450px) { + + ::-webkit-scrollbar { + width: 4px !important; + height: 4px !important; + } +} + ::-webkit-scrollbar { width: 10px; height: 10px; diff --git a/version/git-version.ts b/version/git-version.ts index 3a025a0ae..00359a9bf 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a526b9153", - "SHA": "a526b9153217d80d3d345ee51e91347f7e0fe21d", + "shortSHA": "0efec4a16", + "SHA": "0efec4a16bdfee2708c41baba68319258201ca03", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu May 18 17:40:52 2023 +0100'", - "lastCommitMessage": "fix box sixing", - "lastCommitNumber": "4936", + "lastCommitTime": "'Fri May 19 12:00:51 2023 +0100'", + "lastCommitMessage": "generate fix", + "lastCommitNumber": "4937", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.html\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.scss", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file