diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 30ca368f1..c6937e8f8 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -14,14 +14,18 @@
- + + + +

{{ attendee.Name }}

{{ attendee.EmailAddress }}

- + +
@@ -35,7 +39,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +58,10 @@
- + + + +

{{ attendee.Name }}

diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index 5dfaeae0c..4936f9d95 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { EventPerson } from 'src/app/models/eventperson.model'; import { ModalController, NavParams } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendees', @@ -25,7 +26,8 @@ export class AttendeesPageModal implements OnInit { private modalCtrl: ModalController, private contactsService: ContactsService, private navParams: NavParams, - private modalController: ModalController) { + private modalController: ModalController, + public ThemeService: ThemeService) { this.adding = this.navParams.get('adding'); this.taskParticipants = this.navParams.get('taskParticipants'); diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html index 9f63cff4d..dd839dd99 100644 --- a/src/app/services/events/attendees/attendees.page.html +++ b/src/app/services/events/attendees/attendees.page.html @@ -14,7 +14,8 @@
- + +

{{ attendee.Name }}

@@ -35,7 +36,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +55,8 @@
- + +

{{ attendee.Name }}

diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 1c3a0d70f..52fa56a75 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -14,14 +14,16 @@
- + +

{{ attendee.Name }}

{{ attendee.EmailAddress }}

-
- +
+ +
@@ -35,7 +37,8 @@
- + +

{{ attendee.Name }}

@@ -53,7 +56,8 @@
- + +

{{ attendee.Name }}

diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index d6beba13d..863095e9f 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -3,6 +3,7 @@ import { ModalController } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' +import { ThemeService } from 'src/app/services/theme.service' @Component({ selector: 'app-attendee-modal', @@ -34,7 +35,8 @@ export class AttendeePage implements OnInit { constructor( private modalCtrl: ModalController, - private contactsService: ContactsService ) { + private contactsService: ContactsService, + public ThemeService: ThemeService ) { this.LtaskParticipants = removeDuplicate(this.taskParticipants); this.LtaskParticipantsCc = removeDuplicate(this.taskParticipantsCc); diff --git a/src/assets/images/theme/gov/icons-add-25.svg b/src/assets/images/theme/gov/icons-add-25.svg new file mode 100644 index 000000000..db9cf71cc --- /dev/null +++ b/src/assets/images/theme/gov/icons-add-25.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/theme/variables.scss b/src/theme/variables.scss index efd5367ce..1d4375fc8 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -520,6 +520,7 @@ $app-theme: mat-light-theme( background-color: #42b9fe; color: #ffffff !important; } + .btn-delete { display: block; width: 170px !important; @@ -530,6 +531,7 @@ $app-theme: mat-light-theme( background-color: #ffe0e0; color: #d30a0a !important; } + .btn-cancel { display: block; width: 170px !important;