peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-27 15:14:42 +01:00
parent c8fe85930b
commit e1b1f5e62a
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/view-event/view-event.page.html
+4 -4
View File
@@ -8,15 +8,15 @@
<div class="main-content d-flex height-100" [className]="isModal ? '_main-content d-flex height-100 ma-0 px-20 pt-30 pb-20 background-white' : 'main-content d-flex height-100'">
<div class="content d-flex flex-column width-100">
<div class="main-header d-flex">
<div class="title-content d-flex justify-between width-100">
<div class="left">
<div class="title-content d-flex justify-between width-100 mb-10">
<div class="left d-flex">
<button class="btn-no-color d-flex align-center" (click)="goBack()">
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="end" src='assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle">
<div class="middle d-flex align-center">
<p class="title" style="font-size: 21.1px"><span>{{loadedEvent.Subject}}</span></p>
</div>
<div class="menu-options d-flex">
@@ -24,7 +24,7 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
</button>
<button class="btn-no-color" (click)="deleteYesOrNo()">
<button class="btn-no-color d-flex" (click)="deleteYesOrNo()">
<ion-icon class="delete" name="trash-sharp"></ion-icon>
</button>
</div>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header ">
<div class="title-content width-100 d-flex justify-space-between ">
<div class="font-30-rem cursor-pointer d-flex" (click)="goBack()" defaultHref="#">
<div class="font-30-rem cursor-pointer d-flex height-100 align-center" (click)="goBack()" defaultHref="#">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/doneIt/icons-calendar-arrow-left.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
src/app/pages/inactivity/inactivity.page.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="main-wrapper">
<div class="main-content d-flex flex-column width" >
<div class="main-content d-flex flex-column width header-fix" >
<div class="div-top-header">
src/app/tiny-mce/tiny-mce.page.scss
+17 -1
View File
@@ -30,4 +30,20 @@
#my-tinymce {
height: 200% !important;
}
}
editor {
height: 100% !important;
}
.tox-tinymce {
height: 100% !important;
}
src/app/tiny-mce/tiny-mce.page.ts
+19
View File
@@ -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() {
version/git-version.ts
+6 -6
View File
@@ -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 <file>...\" 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 <file>...\" 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"
}