diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss index 3389864c6..86ac0ae4b 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.scss +++ b/src/app/modals/chat-options-features/chat-options-features.page.scss @@ -30,7 +30,7 @@ margin: 0 auto !important; margin-bottom: 10px; } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index 9e419dc03..66fbb4545 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -46,7 +46,7 @@ export class ChatOptionsFeaturesPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth < 701){ this.popoverController.dismiss(); } else{ diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index baf6f1d5a..bd38ed2c1 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -46,7 +46,7 @@ export class ChatOptionsPopoverPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth < 701){ this.popoverController.dismiss(); } else{ diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index c16ada8e6..10bab132a 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -6,7 +6,7 @@
- +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss index 5605876c3..ceeee4fcf 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.scss +++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss @@ -25,7 +25,8 @@ border-top: 1px solid #bbb; margin: 10px auto !important; } -@media only screen and (min-width: 1024px) { + +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; @@ -35,6 +36,10 @@ width: 100% !important; margin-bottom: 10px !important; } + .btn-cancel:hover, .btn-delete:hover{ + background-color: #42b9fe; + color: #fff !important; + } .btn-ok{ width: 100% !important; } @@ -48,4 +53,5 @@ .mobile-only{ display: none !important; } + } diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss index 03fcefe0d..dd61665a1 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.scss +++ b/src/app/shared/popover/messages-options/messages-options.page.scss @@ -25,7 +25,7 @@ border-top: 1px solid #bbb; margin: 0 auto !important; } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; @@ -43,4 +43,4 @@ /* .solid{ display: block; } */ -} \ No newline at end of file +} diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts index 44262ee86..c6d3340b0 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.ts +++ b/src/app/shared/popover/messages-options/messages-options.page.ts @@ -16,8 +16,8 @@ export class MessagesOptionsPage implements OnInit { private modalController: ModalController, private chatService: ChatService, private navParams: NavParams, - ) - { + ) + { this.roomId = this.navParams.get('roomId'); } @@ -25,11 +25,13 @@ export class MessagesOptionsPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 701){ + this.modalController.dismiss(); this.popoverController.dismiss(); } else{ this.modalController.dismiss(); + this.popoverController.dismiss(); } } diff --git a/src/global.scss b/src/global.scss index 275a011df..841dad997 100644 --- a/src/global.scss +++ b/src/global.scss @@ -370,7 +370,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- border-radius: 0 0 25px 25px; } - @media only screen and (min-width: 1140px) { + @media only screen and (min-width: 701px) { .modal-wrapper{ max-width: 400px; }