+
+ +
+ + + + @@ -68,7 +72,7 @@ - +
diff --git a/src/app/modals/add-note/add-note.page.scss b/src/app/modals/add-note/add-note.page.scss index ac1cdefd1..04d427a30 100644 --- a/src/app/modals/add-note/add-note.page.scss +++ b/src/app/modals/add-note/add-note.page.scss @@ -11,7 +11,7 @@ color:#000; float: left; } .content{ - padding: 30px 20px 0 20px !important; + //padding: 30px 20px 0 20px !important; margin: 0; float: left; @@ -20,7 +20,7 @@ float: left; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; - + } .ion-item-container-no-border{ margin: 0px auto; @@ -54,11 +54,7 @@ float: left; padding-right: 10px; float: left; } - .ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; - } + .list-people{ width: 256px; float: left; @@ -144,7 +140,15 @@ float: left; } .buttons{ display: flex; + width: 100% !important; justify-content: space-between; - padding: 20px; + padding: 15px 0 15px 0; overflow: auto; -} \ No newline at end of file +} + +.ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + margin: 5px 20px 0 20px !important; +} diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index 32e76d8b9..f4054a0d3 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -1,6 +1,6 @@
-
+ + diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 31c55ea0c..573c588e3 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -310,7 +310,7 @@ export class DespachoPage implements OnInit { if( window.innerWidth <= 800){ classs = 'modal modal-desktop' } else { - classs = 'modal modal-desktop' + classs = 'add-note-modal' } const modal = await this.modalController.create({ component: AddNotePage, diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 7fe657a88..1bc35bc09 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -294,7 +294,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { this.messages = res['messages'].reverse(); console.log(this.messages); // Reconnect in one second - await new Promise(resolve => setTimeout(resolve, 1000)); + await new Promise(resolve => setTimeout(resolve, 5000)); await this.serverLongPull(); } else { // Got message diff --git a/src/theme/variables.scss b/src/theme/variables.scss index c5b42386b..22a9e4e0c 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -287,7 +287,7 @@ $app-theme: mat-light-theme(( padding: 25px; } */ //MODALS -.emend-message-modal{ +.add-note-modal, .emend-message-modal{ --height: 50%; --border-radius: 10px; padding: 25px; @@ -297,7 +297,7 @@ $app-theme: mat-light-theme(( --height: 50%; --border-radius: 10px; padding: 25px; - background: rgba(51, 51, 51, 0.3); + background: rgba(51, 51, 51, 0.3); } .modal, .newchat, .new-group, .contacts, .group-messages, .custom-modal{ padding-top: 65px; @@ -315,7 +315,7 @@ $app-theme: mat-light-theme(( right: 0 !important; top: calc(100% - 160px) !important; max-height: 160px; - min-height: 160px; + min-height: 160px; } .messages-options .popover-content{ width: 100% !important;