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

Conflit solved

Browse Source
This commit is contained in:
Eudes Inácio
2022-03-03 08:23:27 +01:00
parent 5c210928c0 522ad685e4
commit 8c3fa15aa5
6 changed files with 178 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/messages/messages.page.ts
-1
View File
@@ -201,7 +201,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
const temp: any[] = result.files.reverse();
this.storedFileNames = temp[0];
console.log(this.storedFileNames);
})
}
src/app/services/events/edit-event/edit-event.page.html
+1 -1
View File
@@ -89,7 +89,7 @@
</div>
<div class="div-attach">
<ion-item>
<ion-buttons slot="end" (click)="showAlert()">
<ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Anexos</ion-label>
src/app/services/events/event-detail-modal/event-detail-modal.page.html
+1 -1
View File
@@ -91,7 +91,7 @@
</div>
<div class="div-attach">
<ion-item>
<ion-buttons slot="end" (click)="showAlert()">
<ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Anexos</ion-label>
src/app/services/events/event-detail/event-detail.page.html
+1 -1
View File
@@ -91,7 +91,7 @@
</div>
<div class="div-attach">
<ion-item>
<ion-buttons slot="end" (click)="showAlert()">
<ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Anexos</ion-label>
src/theme/variables.scss
+5 -5
View File
@@ -195,7 +195,7 @@ $app-theme: mat-light-theme(
* -------------------------------------------
*/
.ios body {
/* .ios body {
--ion-background-color: #000000;
--ion-background-color-rgb: 0, 0, 0;
@@ -229,14 +229,14 @@ $app-theme: mat-light-theme(
--ion-card-background: #1c1c1d;
--ion-color-expediente: #dae3f3;
}
} */
/*
* Material Design Dark Theme
* -------------------------------------------
*/
.md body {
/* .md body {
--ion-background-color: #121212;
--ion-background-color-rgb: 18, 18, 18;
@@ -272,9 +272,9 @@ $app-theme: mat-light-theme(
--ion-tab-bar-background: #1f1f1f;
--ion-card-background: #1e1e1e;
/* My colors */
--ion-color-expediente: #dae3f3;
}
} */
}
.center {
text-align: center;