diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index b13445238..5e083bb19 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -8,15 +8,15 @@
-
-
+
+
-
+

{{loadedEvent.Subject}}

diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 89d5da544..87fcf991b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -3,7 +3,7 @@
-
+
diff --git a/src/app/pages/inactivity/inactivity.page.html b/src/app/pages/inactivity/inactivity.page.html index 88a12aaf3..dca5f5624 100644 --- a/src/app/pages/inactivity/inactivity.page.html +++ b/src/app/pages/inactivity/inactivity.page.html @@ -2,7 +2,7 @@
-
+
diff --git a/src/app/tiny-mce/tiny-mce.page.scss b/src/app/tiny-mce/tiny-mce.page.scss index 3cfd2cace..83b7cf333 100644 --- a/src/app/tiny-mce/tiny-mce.page.scss +++ b/src/app/tiny-mce/tiny-mce.page.scss @@ -30,4 +30,20 @@ #my-tinymce { height: 200% !important; - } \ No newline at end of file + } + + +editor { + + height: 100% !important; + +} + + + + +.tox-tinymce { + + height: 100% !important; + +} \ No newline at end of file diff --git a/src/app/tiny-mce/tiny-mce.page.ts b/src/app/tiny-mce/tiny-mce.page.ts index e1ed7be13..9a57c2d38 100644 --- a/src/app/tiny-mce/tiny-mce.page.ts +++ b/src/app/tiny-mce/tiny-mce.page.ts @@ -26,6 +26,25 @@ export class TinyMCEPage implements OnInit { ) { this.Document = this.navParams.get('Document') this.content = this.navParams.get('content') + + + this.waitForTiny(); + } + + waitForTiny() { + const tiny: HTMLDivElement = document.querySelector('.tox-tinymce') + + if(tiny) { + this.doneWaitForTiny(tiny) + } else { + setTimeout(() => { + this.waitForTiny() + }, 500) + } + } + + doneWaitForTiny(tiny: HTMLDivElement) { + tiny.style.height = '100%' } ngOnInit() { diff --git a/version/git-version.ts b/version/git-version.ts index fc1482726..8ba4f9951 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7481437ad", - "SHA": "7481437ad7d36007bf8f7a9b1f8f3bf8dcd4dca1", + "shortSHA": "c8fe85930", + "SHA": "c8fe85930b6576a7ae6656ab2d67f9c2b8091307", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Jul 27 13:19:34 2023 +0100'", - "lastCommitMessage": "fix search", - "lastCommitNumber": "5116", + "lastCommitTime": "'Thu Jul 27 13:36:38 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "5117", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/inactivity/inactivity.page.html\n\tmodified: src/app/tiny-mce/tiny-mce.page.scss\n\tmodified: src/app/tiny-mce/tiny-mce.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file