diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 90c64b523..c1b141ebc 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -8,14 +8,11 @@ -
- -
- - +
+

Chat

- + Conversas @@ -26,11 +23,11 @@
-
+
-
+
@@ -50,6 +47,26 @@
+
+
+ +
+
+
+
+ + + Tiago + + +
+
23/03/202 12:20
+
+
+ oI... +
+
+
@@ -79,12 +96,11 @@
- -
- - + +
+ +
-
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 43032bb06..1969c6ff5 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -53,6 +53,10 @@ ion-content{ border-top-left-radius: 25px; border-top-right-radius: 25px; + .aside-wrapper{ + justify-content: flex-start !important; + } + .iconschatnew-group{ width: 30px; height: 30px; @@ -65,6 +69,7 @@ ion-content{ object-fit: contain; margin: 0 5px 0 5px; } + } .item{ @@ -109,25 +114,37 @@ ion-content{ color: #000; } } - @media only screen and (min-width: 1024px) { .main-content{ + border: 1px solid blue; + overflow: auto; + .aside-wrapper{ + width: 40%; border: 1px solid red; - justify-content: flex-start !important; .aside-title{ - font-family: Roboto; - font-size: 25px; text-align: left; + font-size: 25px; + } } .aside{ width: 340px; } .aside-content{ + width: 60%; display: flex !important; background-color: white; } + .item{ + .item-icon{ + width: 10%; + } + .item-content{ + width: 90%; + } + } + } } diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 24dd04f12..968ce8bd9 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -39,7 +39,8 @@ export class ChatPage implements OnInit { dmUsers:any; desktopComponent: any = { - messages: false, + showMessages: false, + showGroupMessages: false, } constructor( @@ -56,7 +57,7 @@ export class ChatPage implements OnInit { } closeAllDesktopComponent(){ this.desktopComponent = { - messages: false, + showMessages: false, } } ngOnInit() { @@ -192,7 +193,7 @@ export class ChatPage implements OnInit { await modal.present(); modal.onDidDismiss(); } - + async openGroupMessages(room:any){ let classs; if( window.innerWidth <= 1024){ diff --git a/src/global.scss b/src/global.scss index 0f361a714..41d57aff6 100644 --- a/src/global.scss +++ b/src/global.scss @@ -324,7 +324,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .chat-mobile-modal-to-Desktop{ top: 75px; - left: 340px; + left: 31%; transform: none !important; ion-backdrop{ display: none;