Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/chat/messages/messages.page.html

@@ -6,7 +6,7 @@
           <ion-label class="title">{{users.name}}</ion-label>
           <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span>
         </div>
-        <div class="right">
+        <div hidden class="right">
           <button class="btn-no-color" (click)="_openMessagesOptions()">
             <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
           </button>

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{

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -6,9 +6,8 @@
   </div>
   <div class="buttons">
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
-    <button (click)="openChangeGroupName()" class="btn-ok" shape="round" >Alterar nome do grupo</button>
+    <button (click)="openChangeGroupName()" class="btn-cancel" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>
-    <button (click)="bookMeeting()" class="btn-cancel" shape="round">Marcar Reunião</button>
     <button (click)="close()" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
     <button (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
   </div>

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;
   }
+
 }

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -25,7 +25,7 @@ export class ChatPopoverPage implements OnInit {
   }
 
   close(){
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 701){
       this.popoverController.dismiss('cancel');
       this.modalController.dismiss('cancel');
     }
@@ -86,8 +86,4 @@ export class ChatPopoverPage implements OnInit {
     this.modalController.dismiss('edit');
   }
 
-  bookMeeting(){
-
-  }
-
 }

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;
     } */
-}
+}

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();
     }
   }