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

changes

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-13 11:01:08 +01:00
parent 8163e15f9b 0cab890efd
commit 5cec6d8b76
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.ts
-1
View File
@@ -11,7 +11,6 @@ import { BackgroundService } from '../../../services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
import { ThemeService } from 'src/app/services/theme.service'
import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import { EventsService } from 'src/app/services/events.service';
import { SessionStore } from 'src/app/store/session.service';
import { environment } from 'src/environments/environment';
src/theme/variables.scss
+2 -2
View File
@@ -609,8 +609,8 @@ $app-theme: mat-light-theme(
margin: 0 auto !important;
padding: 0 !important;
border-radius: 22.5px;
background-color: #42b9fe;
color: #ffffff !important;
background-color: var(--button-color);
color: var(--button-text-color);
}
.btn-delete-medium {
display: block;
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "2375eb33b",
"SHA": "2375eb33b5bd80826b6640a354d7e85a47ef72fe",
"shortSHA": "8163e15f9",
"SHA": "8163e15f9b6b0596eef404628416be8c675786c6",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Mon Jun 12 11:46:38 2023 +0100'",
"lastCommitMessage": "pull made",
"lastCommitNumber": "5009",
"lastCommitTime": "'Mon Jun 12 12:19:29 2023 +0100'",
"lastCommitMessage": "change",
"lastCommitNumber": "5011",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 3 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: src/app/modals/eliminate-event/eliminate-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 4 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/theme/variables.scss",
"changeAuthor": "eudes.inacio"
}