diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 6af927624..86e8b92b3 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -10,7 +10,7 @@ - Agenda + Agenda diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 0b71daa26..42181215b 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -1,4 +1,4 @@ -/// +// import { Component, OnInit, NgZone } from '@angular/core'; import { EventsService } from '../services/events.service'; import { Event } from '../models/event.model'; @@ -12,9 +12,9 @@ import { Router } from '@angular/router'; import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx'; import { ViewEventPage } from '../pages/agenda/view-event/view-event.page'; import { ExpedienteDetailPage } from '../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; -import { PublicationDetailPage } from '../pages/publications/publication-detail/publication-detail.page'; import { ViewPublicationsPage } from '../pages/publications/view-publications/view-publications.page'; import { ApproveEventModalPage } from '../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page'; +import { PublicationDetailPage } from '../pages/publications/view-publications/publication-detail/publication-detail.page'; /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */ @@ -76,33 +76,33 @@ export class HomePage implements OnInit { ngOnInit() { - this.pushCordova(); - //Initialize profile as mdgpr - - /* let date = new Date(); - date.setMonth(date.getMonth() + 1); - let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59"; - - this.profile = "mdgpr"; - if (this.profile == "mdgpr") { - this.eventService.getAllMdEvents(start, end).subscribe(res => { - this.eventsList = res; - this.totalEvent = this.eventsList.length; - }); - } - else { - this.eventService.getAllPrEvents(start, end).subscribe(res => { - this.eventsList = res; - this.totalEvent = this.eventsList.length; - }); - - } - this.processesbackend.GetTasksList("Expediente", true).subscribe(result => { - this.totalExpediente = result; - });*/ - + //Add a test + //this.pushCordova(); + //Initialize profile as mdgpr + + let date = new Date(); + date.setMonth(date.getMonth() + 1); + let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59"; + + this.profile = "mdgpr"; + if (this.profile == "mdgpr") { + this.eventService.getAllMdEvents(start, end).subscribe(res => { + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); + } + else { + this.eventService.getAllPrEvents(start, end).subscribe(res => { + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); + + } + } + + pushCordova() { if(this.platform.is('desktop')) { diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 35448c226..c5c899c6f 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -863,26 +863,29 @@ export class AgendaPage implements OnInit { selectFirstEventOfTheDay(){ setTimeout(()=>{ + + if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){ + let sortedDate = this.eventSource.sort((a,b) =>{ + return (b.startTime) -(a.startTime); + }); - let sortedDate = this.eventSource.sort((a,b) =>{ - return (b.startTime) -(a.startTime); - }); - - - let filterDate = sortedDate.filter((e) => { - return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); - }); - - const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); - - const scrollContainer = document.querySelector('.timeline-wrapper'); - - scrollContainer.scroll({ - top: firstEventStartHours*60, - left: 0, - behavior: 'smooth' - }) + + let filterDate = sortedDate.filter((e) => { + return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); + }); + + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + const scrollContainer = document.querySelector('.timeline-wrapper'); + scrollContainer.scroll({ + top: firstEventStartHours*60, + left: 0, + behavior: 'smooth' + }) + + } + }, 500); } @@ -1147,8 +1150,6 @@ export class AgendaPage implements OnInit { this.postEvent = false; } - - async changeSegment(segments: "Combinado" | "Pessoal" | "Oficial") { this.segment = segments; @@ -1159,5 +1160,4 @@ export class AgendaPage implements OnInit { } } - } \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 20af874a9..f70564f5a 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -109,20 +109,13 @@ export class ViewEventPage implements OnInit { async editEventDetail() { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal' - } else { - classs = 'modal modal-desktop' - } - const modal = await this.modalController.create({ component: EditEventPage, componentProps: { eventId: this.loadedEvent.EventId, profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', }); } @@ -131,7 +124,7 @@ export class ViewEventPage implements OnInit { let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } @@ -151,6 +144,7 @@ export class ViewEventPage implements OnInit { if(res){ setTimeout(() => { /* this.loadEvent(); */ + this.loadEvent() this.getAttachments(); }, 250); this.isEventEdited = true; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index c4ff82d22..a24365d5f 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -28,12 +28,11 @@ export class EventListPage implements OnInit { private modalController: ModalController, private router: Router, private navParams: NavParams, - ) { } + ) { } ngOnInit() { this.profile = this.navParams.get('profile'); - console.log(this.profile); - + /* console.log(this.navParams.get('md')); */ if(this.profile == "mdgpr"){ this.profile = 'MDGPR' @@ -53,7 +52,7 @@ export class EventListPage implements OnInit { window.onresize = (event) => { // if not mobile remove all component - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 800){ this.modalController.dismiss(); } }; @@ -73,21 +72,15 @@ export class EventListPage implements OnInit { }); } - async openApproveModal(eventSerialNumber){ - let classs; - if( window.innerWidth <= 1024){ - classs = 'cal-modal modal modal-desktop' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } + const modal = await this.modalController.create({ component: ApproveEventModalPage, componentProps:{ serialNumber: eventSerialNumber, }, - cssClass: 'event-list', + cssClass: 'event-list cal-modal modal modal-desktop', backdropDismiss: false }); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index b416942c5..123b90ad5 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -61,7 +61,7 @@ -
+
@@ -82,7 +82,7 @@ -
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index a7709d154..8ff977153 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -113,6 +113,7 @@ export class ExpedientTaskModalPage implements OnInit { } saveTask(){ + let attendees = this.taskParticipants.concat(this.taskParticipantsCc); attendees = attendees.map(function(val) { return { @@ -120,6 +121,7 @@ export class ExpedientTaskModalPage implements OnInit { UserType: val.IsRequired?"I": "CC" }; }) + if(this.taskParticipants.length > 0){ switch (this.taskType){ case '0': @@ -185,7 +187,10 @@ export class ExpedientTaskModalPage implements OnInit { this.adding = "intervenient"; this.contacts = this.taskParticipants; - if(window.innerWidth <=1024){ + if(window.innerWidth <=800){ + + this.showAttendees=false; + const modal = await this.modalController.create({ component: AddParticipantsModalPage, componentProps: { @@ -214,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit { console.log(this.postData); }); } else { - + this.showAttendees=true } } @@ -223,7 +228,9 @@ export class ExpedientTaskModalPage implements OnInit { this.adding = "CC"; this.contacts = this.taskParticipantsCc; - if(window.innerWidth <=1024){ + if(window.innerWidth <=800){ + this.showAttendees=false; + const modal = await this.modalController.create({ component: AddParticipantsCcModalPage, componentProps: { @@ -251,6 +258,8 @@ export class ExpedientTaskModalPage implements OnInit { this.postData.UsersSelected = this.participants; console.log(this.postData); }); + } else { + this.showAttendees=true } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 0faf5dfbb..14b9fca6b 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -141,7 +141,7 @@ export class ExpedienteDetailPage implements OnInit { //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800){ - classs = 'modal' + classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } @@ -193,7 +193,7 @@ export class ExpedienteDetailPage implements OnInit { async openBookMeetingModal(task: any) { let classs; if( window.innerWidth <= 800){ - classs = 'book-meeting-modal' + classs = 'book-meeting-modal modal modal-desktop' } else { classs = 'modal modal-desktop showAsideOptions' } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 1363d9c4d..a6f019fbc 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -65,14 +65,7 @@ export class ExpedientePage implements OnInit { } async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } const modal = await this.modalController.create({ component: ExpedienteDetailPage, @@ -80,7 +73,7 @@ export class ExpedientePage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 14273edd9..e0357154b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -20,7 +20,7 @@
-
+
@@ -28,7 +28,7 @@

{{count_ev_md+count_ev_pr}} Documentos

-
+
@@ -36,7 +36,7 @@

{{count_exp_dailywork}} Documentos

-
+
@@ -44,21 +44,24 @@

Pendentes

- Documentos

-
+ +

Pedidos de Parecer

- Documentos

-
+ +

Pedidos de Deferimento

- Documentos

-
+ +
@@ -66,15 +69,15 @@

- Documentos

- -
+

Expediente Presidente

- Documentos

-
+ +
@@ -82,9 +85,7 @@

- Documentos

- - -
+
@@ -95,7 +96,8 @@
-
+ +
@@ -107,14 +109,16 @@
-
+

Diplomas assinaldos PR

- Documentos

+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 3a3b9b069..0b5a60046 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -345,3 +345,9 @@ ion-content{ width: 25%; } } + + +.active { + border: 1px solid green; + box-sizing: border-box; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index a7eacfcb0..34ad0b2c6 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; templateUrl: './gabinete-digital.page.html', styleUrls: ['./gabinete-digital.page.scss'], }) + export class GabineteDigitalPage implements OnInit { segment:string; @@ -27,11 +28,13 @@ export class GabineteDigitalPage implements OnInit { count_ev_pr=0; count_ev_md=0; + selectedElement = ""; desktopComponent: any = { showEventList: false, showExpediente : false } + showEventsToApprove = false; showEmptyContainer = false; showExpedients = true; @@ -46,17 +49,15 @@ export class GabineteDigitalPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, private router: Router, - ) { + ) { window.onresize = (event) => { // if not mobile remove all component if( window.innerWidth <= 1024){ this.modalController.dismiss(); } - this.adjastModalHeight(); - }; - this.adjastModalHeight(); + }; this.activatedRoute.queryParams.subscribe(params => { if(params["show"]){ @@ -69,24 +70,6 @@ export class GabineteDigitalPage implements OnInit { } - adjastModalHeight(){ - setTimeout(() => { - if( window.innerWidth <= 1366){ - - document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{ - console.log('adjast width') - e.setAttribute('style',`height:${window.innerHeight - (74 + 57)}px`) - }) - } else if( window.innerWidth >= 1366){ - document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{ - console.log('adjast width') - e.setAttribute('style',`height:${window.innerHeight - (74)}px`) - }) - } - }, 200); - - - } closeAllDesktopComponent(){ this.desktopComponent = { @@ -94,6 +77,7 @@ export class GabineteDigitalPage implements OnInit { showExpediente: false } } + ngOnInit() { //Initialize profile as mdgpr this.profile = "MDGPR"; @@ -178,22 +162,13 @@ this.processesbackend.GetActionsList().subscribe(res=>{ async openEventsToApproveList(profile:any){ this.closeAllDesktopComponent(); - - let classs; - if( window.innerWidth <= 800){ - classs = 'modal' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } - //if( window.innerWidth <= 1024){ - this.adjastModalHeight(); const modal = await this.modalController.create({ component: EventListPage, componentProps:{ profile: profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); @@ -203,6 +178,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ //} } + openExpedientListPage(){ this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ @@ -212,6 +188,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedients = true; } } + openExpedientPage(data){ console.log(data); @@ -224,24 +201,18 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedientDetail = true; } } + async openExpedientList(){ this.closeAllDesktopComponent(); - let classs; - if( window.innerWidth <= 1024){ - classs = 'modal' - } else { - classs = 'gabinete-digital-mobile-modal-to-Desktop' - } //if( window.innerWidth <= 1024){ - this.adjastModalHeight(); const modal = await this.modalController.create({ component: ExpedientePage, componentProps:{ profile: this.profile, }, - cssClass: classs, + cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 5a8ff7e6d..1b6d8c16a 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -1,18 +1,3 @@ - - -
-
- -
- -
- -
-
- -
diff --git a/src/app/pages/publications/new-action/new-action.page.scss b/src/app/pages/publications/new-action/new-action.page.scss index 0afd7e02b..3235d1aa2 100644 --- a/src/app/pages/publications/new-action/new-action.page.scss +++ b/src/app/pages/publications/new-action/new-action.page.scss @@ -14,7 +14,6 @@ ion-toolbar{ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -41,7 +40,6 @@ ion-toolbar{ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -60,7 +58,6 @@ ion-toolbar{ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -79,7 +76,6 @@ font-size: 25px; overflow: auto; } .ion-item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; @@ -92,8 +88,8 @@ font-size: 25px; overflow: auto; } .ion-item-class-2{ - width: 360px; margin: 0px auto; + display: flex; } .ion-icon-class{ width: 45px; @@ -101,24 +97,23 @@ font-size: 25px; float: left; padding: 10px; font-size: 25px; + } .ion-input-class{ - width: 315px; height: auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-textarea-class{ - width: 315px; height: auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-input-class-no-height{ border: 1px solid #ebebeb; diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 2afd16c36..bdb7963d1 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -1,18 +1,4 @@ - - -
-
- -
- -
- -
-
- - +
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss index b4b9d9880..c4a9f8a30 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.scss +++ b/src/app/pages/publications/new-publication/new-publication.page.scss @@ -14,7 +14,6 @@ ion-toolbar{ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -41,7 +40,6 @@ ion-toolbar{ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -60,7 +58,6 @@ ion-toolbar{ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -79,7 +76,6 @@ font-size: 25px; overflow: auto; } .ion-item-container{ - width: 360px; margin: 15px auto; border: 1px solid #ebebeb; border-radius: 5px; @@ -92,8 +88,8 @@ font-size: 25px; overflow: auto; } .ion-item-class-2{ - width: 360px; margin: 0px auto; + display: flex; } .ion-icon-class{ width: 45px; @@ -109,7 +105,7 @@ font-size: 25px; border-radius: 5px; padding-left: 5px; padding-right: 10px; - float: left; + flex: 1; } .ion-input-class-no-height{ border: 1px solid #ebebeb; diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 502a47b0c..976e8c80d 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -81,7 +81,7 @@ export class NewPublicationPage implements OnInit { this.capturedImage = imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; }, (err) => { - console.log(err); + /* console.log(err); */ }); } @@ -102,7 +102,7 @@ export class NewPublicationPage implements OnInit { this.capturedImage = imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; }, (err) => { - console.log(err); + /* console.log(err); */ }); } @@ -139,8 +139,8 @@ export class NewPublicationPage implements OnInit { FileBase64: this.publication.FileBase64, FileExtension: 'jpeg', } - console.log('Edit - keep image'); - console.log(this.publication); + /* console.log('Edit - keep image'); + console.log(this.publication); */ this.publications.UpdatePublication(this.publication.ProcessId, this.publication); this.close(); } @@ -159,8 +159,8 @@ export class NewPublicationPage implements OnInit { FileExtension: 'jpeg', } - console.log('Create'); - console.log(this.publication); + /* console.log('Create'); + console.log(this.publication); */ this.publications.CreatePublication(this.folderId, this.publication); this.close(); } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html index e937f9f16..bfc55cfb7 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/publication-detail/publication-detail.page.html @@ -1,21 +1,6 @@ - - -
-
- -
- -
- -
-
- - + -
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.scss b/src/app/pages/publications/publication-detail/publication-detail.page.scss index dd3f55ae5..3230c6d73 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.scss +++ b/src/app/pages/publications/publication-detail/publication-detail.page.scss @@ -10,7 +10,6 @@ border-width: 0 !important; } .div-top-header{ - width: 400px; margin: 0 auto; background-color: #0782c9; overflow: auto; @@ -37,7 +36,6 @@ margin-right: 10px; } .content-top{ - width: 344px; background: #f3f2f2; height: 20px; margin: 0 auto; @@ -55,7 +53,6 @@ overflow: auto; } .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; @@ -67,7 +64,6 @@ overflow: auto; } .div-title{ - width: 270px; /* padding: 0!important; */ float: left; margin: 2.5px 0 0 5px; @@ -88,7 +84,6 @@ object-fit: cover; } .post-description{ - width: 360px; margin: 0 auto; margin-bottom: 35px; } \ No newline at end of file diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 6e564f5d5..cb93c0fd7 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -94,7 +94,7 @@ export class PublicationDetailPage implements OnInit { publicationType: publicationType, publication: this.publication, }, - cssClass: 'new-publication', + cssClass: 'new-publication modal modal-desktop', backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index d9004521b..8517bb29c 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -16,9 +16,9 @@
-
-
- Acções Presidenciais +
+
+ Acções Presidenciais