diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index 835c8736e..98f214cce 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -31,7 +31,7 @@
{{customDate}}
- das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}
+ das {{loadedEvent.StartDate}} às {{loadedEvent.EndDate}}
(Não se repete)
Repete
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 5c4ca0b5f..f01703921 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -261,6 +261,12 @@ export class EventsPage implements OnInit {
}
async viewEventDetail(eventId:any) {
+ let classs;
+ if( window.innerWidth <= 800){
+ classs = 'modal'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
console.log(this.profile);
const modal = await this.modalController.create({
@@ -269,8 +275,7 @@ export class EventsPage implements OnInit {
eventId: eventId,
profile: this.profile,
},
- cssClass: 'modal',
- backdropDismiss: false
+ cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res)=>{
@@ -282,6 +287,12 @@ export class EventsPage implements OnInit {
}
async viewExpedientDetail(serialNumber:any) {
+ let classs;
+ if( window.innerWidth <= 800){
+ classs = 'modal'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
/* console.log(this.profile);
console.log(serialNumber); */
@@ -291,8 +302,7 @@ export class EventsPage implements OnInit {
serialNumber: serialNumber,
profile: this.profile,
},
- cssClass: 'modal',
- backdropDismiss: false
+ cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res)=>{
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
index c424dc06d..860c052db 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
@@ -19,54 +19,52 @@
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
-
- .header-top{
- width: 360px;
- margin: 0px auto;
- overflow: auto;
- padding: 0 !important;
- background: #fff;
- .middle{
- padding: 0!important;
- float: left;
- width: 280px;
- margin: 2.5px 0 0 5px;
- display: flex;
- align-items: center;
+ .header-top{
+ width: 360px;
+ margin: 0px auto;
+ overflow: auto;
+ padding: 0 !important;
+ background: #fff;
+ .middle{
+ padding: 0!important;
+ float: left;
+ width: 280px;
+ margin: 2.5px 0 0 5px;
+ display: flex;
+ align-items: center;
- }
- .right{
- padding: 0!important;
- float: right;
- font-size: 25px;
- color: #0782c9;
- margin: 5px 0 0 0;
- }
}
- .header-bottom{
- width: 310px;
- overflow: auto;
- margin: 0 auto;
+ .right{
+ padding: 0!important;
+ float: right;
+ font-size: 25px;
+ color: #0782c9;
+ margin: 5px 0 0 0;
+ }
+ }
+ .header-bottom{
+ width: 310px;
+ overflow: auto;
+ margin: 0 auto;
- .header-bottom-icon{
- width: 30px;
- font-size: 25px;
- float: left;
- padding: 2px;
-
- }
- .header-bottom-contacts{
- width: 275px;
- font-size: 15px;
- color: #797979;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- float: left;
+ .header-bottom-icon{
+ width: 30px;
+ font-size: 25px;
+ float: left;
+ padding: 2px;
+ }
+ .header-bottom-contacts{
+ width: 275px;
+ font-size: 15px;
+ color: #797979;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ float: left;
padding: 5px;
- margin: 1px;
- }
+ margin: 1px;
}
+ }
.title{
font-size: 25px;
@@ -197,25 +195,42 @@ ion-button{
}
}
-@media only screen and (max-width: 1023px) {
+@media only screen and (max-width: 800px) {
.content{
- width: 100%;
+ width: 100% !important;
}
.aside-right{
display: none;
}
}
-@media only screen and (min-width: 1024px) {
+@media only screen and (min-width: 801px) {
.div-icon{
display: none;
}
.content{
- width: 80%;
+ width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
- width: 20%;
- border: 1px solid red;
+ width: 35%;
}
-}
\ No newline at end of file
+}
+
+@media only screen and (min-width: 1024px){
+ .content{
+ width: 70%;
+ }
+ .aside-right{
+ width: 30%;
+ }
+}
+
+@media only screen and (min-width: 1140px){
+ .content{
+ width: 75%;
+ }
+ .aside-right{
+ width: 25%;
+ }
+}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index f45ad317f..edcf0b404 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -75,7 +75,7 @@ export class ExpedientsPage implements OnInit {
console.log(this.profile);
let classs;
- if( window.innerWidth <= 1024){
+ if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
diff --git a/src/global.scss b/src/global.scss
index a88d8b321..4cdff9eb1 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -291,7 +291,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
}
}
.hideAsideOptions{
- @media only screen and (min-width: 1140px) {
+ @media only screen and (max-width: 800px) {
.div-icon{
display: none;
}
@@ -313,7 +313,29 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
} */
}
.showAsideOptions{
- @media only screen and (min-width: 1140px) {
+
+ @media only screen and (min-width: 801px) {
+ .div-icon{
+ display: none;
+ }
+ .content{
+ width: 65%;
+ border-right: 1px solid #d8d8d8;
+ }
+
+ .aside-right{
+ width: 35%;
+ }
+ }
+ @media only screen and (min-width: 1024px){
+ .content{
+ width: 70%;
+ }
+ .aside-right{
+ width: 30%;
+ }
+ }
+ @media only screen and (min-width: 1140px) {
.div-icon{
display: none;
}