peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +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
android/app/src/main/res/drawable/ic_launcher_background.xml
+170
View File
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
</vector>
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(); const temp: any[] = result.files.reverse();
this.storedFileNames = temp[0]; this.storedFileNames = temp[0];
console.log(this.storedFileNames); console.log(this.storedFileNames);
}) })
} }
src/app/services/events/edit-event/edit-event.page.html
+1 -1
View File
@@ -89,7 +89,7 @@
</div> </div>
<div class="div-attach"> <div class="div-attach">
<ion-item> <ion-item>
<ion-buttons slot="end" (click)="showAlert()"> <ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label> <ion-label color="secondary">Editar</ion-label>
</ion-buttons> </ion-buttons>
<ion-label class="attach-label">Anexos</ion-label> <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>
<div class="div-attach"> <div class="div-attach">
<ion-item> <ion-item>
<ion-buttons slot="end" (click)="showAlert()"> <ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label> <ion-label color="secondary">Editar</ion-label>
</ion-buttons> </ion-buttons>
<ion-label class="attach-label">Anexos</ion-label> <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>
<div class="div-attach"> <div class="div-attach">
<ion-item> <ion-item>
<ion-buttons slot="end" (click)="showAlert()"> <ion-buttons slot="end">
<ion-label color="secondary">Editar</ion-label> <ion-label color="secondary">Editar</ion-label>
</ion-buttons> </ion-buttons>
<ion-label class="attach-label">Anexos</ion-label> <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: #000000;
--ion-background-color-rgb: 0, 0, 0; --ion-background-color-rgb: 0, 0, 0;
@@ -229,14 +229,14 @@ $app-theme: mat-light-theme(
--ion-card-background: #1c1c1d; --ion-card-background: #1c1c1d;
--ion-color-expediente: #dae3f3; --ion-color-expediente: #dae3f3;
} } */
/* /*
* Material Design Dark Theme * Material Design Dark Theme
* ------------------------------------------- * -------------------------------------------
*/ */
.md body { /* .md body {
--ion-background-color: #121212; --ion-background-color: #121212;
--ion-background-color-rgb: 18, 18, 18; --ion-background-color-rgb: 18, 18, 18;
@@ -272,9 +272,9 @@ $app-theme: mat-light-theme(
--ion-tab-bar-background: #1f1f1f; --ion-tab-bar-background: #1f1f1f;
--ion-card-background: #1e1e1e; --ion-card-background: #1e1e1e;
/* My colors */
--ion-color-expediente: #dae3f3; --ion-color-expediente: #dae3f3;
} } */
} }
.center { .center {
text-align: center; text-align: center;