diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss index 660b3fd84..cbe5a62e7 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -146,9 +146,17 @@ margin-top: 4px; } - ion-col .type-message{ + .type-message{ + display: flex; border: 1px solid #ebebeb; border-radius: 25px; padding-left: 15px; + align-items: center; + overflow: auto; + + ion-textarea{ + margin: 0 !important; + align-self: center; + } } } \ No newline at end of file diff --git a/src/app/pages/chat/messages/messages.page.scss b/src/app/pages/chat/messages/messages.page.scss index c4d46dab3..c388a5fca 100644 --- a/src/app/pages/chat/messages/messages.page.scss +++ b/src/app/pages/chat/messages/messages.page.scss @@ -151,10 +151,18 @@ margin-top: 4px; } - ion-col .type-message{ + .type-message{ + display: flex; border: 1px solid #ebebeb; border-radius: 25px; padding-left: 15px; + align-items: center; + overflow: auto; + + ion-textarea{ + margin: 0 !important; + align-self: center; + } } } @@ -169,4 +177,5 @@ float: left; color:#99e47b; padding-left: 10px; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 42ca79a57..9e1cf97a6 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -11,6 +11,8 @@ import { ContactsPage } from '../new-group/contacts/contacts.page'; }) export class MessagesPage implements OnInit { + message = ''; + constructor( public popoverController: PopoverController, private modalController: ModalController, diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html index 8b6d4b772..fe521a847 100644 --- a/src/app/pages/chat/new-group/new-group.page.html +++ b/src/app/pages/chat/new-group/new-group.page.html @@ -19,12 +19,12 @@
- - +
+ Grupo Ultra-secreto - +
-
+
diff --git a/src/app/pages/chat/new-group/new-group.page.scss b/src/app/pages/chat/new-group/new-group.page.scss index 244fbb7bd..d05552f41 100644 --- a/src/app/pages/chat/new-group/new-group.page.scss +++ b/src/app/pages/chat/new-group/new-group.page.scss @@ -107,21 +107,19 @@ ion-content{ border-radius: 5px; padding-left: 10px; } + .item-container-no-border{ + display: flex; width: 360px; - margin: 15px auto; + margin: 25px auto; border-radius: 5px; - padding-left: 10px; - } - .item-container-no-border ion-checkbox{ - margin-top: 10px; + align-items: center; } .item-container-no-border ion-label{ padding-left: 10px; font-size: 12px; color: #000; - margin-top: 0 !important; } } diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts index c284363ea..1fbb15d22 100644 --- a/src/app/pages/chat/new-group/new-group.page.ts +++ b/src/app/pages/chat/new-group/new-group.page.ts @@ -9,6 +9,7 @@ import { ContactsPage } from './contacts/contacts.page'; }) export class NewGroupPage implements OnInit { showLoader: boolean; + showDuration: boolean; constructor( private modalController: ModalController, @@ -18,6 +19,9 @@ export class NewGroupPage implements OnInit { ngOnInit() { + } + _ionChange(event){ + this.showDuration = event.detail.checked; } close(){ this.modalController.dismiss(); 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 57d54bff0..93794cd0d 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -9,9 +9,10 @@ - + + diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 3e18c59fb..07c0841ee 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { PopoverController } from '@ionic/angular'; @Component({ selector: 'app-chat-popover', @@ -7,9 +8,14 @@ import { Component, OnInit } from '@angular/core'; }) export class ChatPopoverPage implements OnInit { - constructor() { } + constructor( + private popoverController: PopoverController, + ) { } ngOnInit() { } + close(){ + this.popoverController.dismiss(); + } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index ab3f10b64..ccde3299d 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -264,7 +264,7 @@ background: rgba(51, 51, 51, 0.3); } .newchat, .new-group, .contacts, .group-messages, .custom-modal{ - padding-top: 73px; + padding-top: 93px; --border-radius: 25px 25px 0 0; --border-width:0px; }