diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 4219e2cc0..e78bcaa91 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -41,55 +41,55 @@
- - +
-
+
-
+
{{user}}
-
{{dm._updatedAt | date: 'HH:mm'}}
+
{{dm._updatedAt | date: 'HH:mm'}}
-
+
{{dm.lastMessage.msg}}
- +
- - -
+
-
+
-
+
{{group.name.split('-').join(' ')}}
-
{{group.lastMessage._updatedAt | date: 'HH:mm'}}
+
{{group.lastMessage._updatedAt | date: 'HH:mm'}}
-
+
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
- -
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index dddff7f8a..ac3c068b3 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -51,7 +51,7 @@ ion-content{ } .aside{ - padding: 0px 20px 0 20px !important; + padding: 0 !important; } } @@ -73,6 +73,7 @@ ion-content{ .item{ width: 100%; border-bottom: 1px solid #ebebeb; + padding: 0px 20px 0 20px !important; overflow: auto; .item-icon{ @@ -86,8 +87,9 @@ ion-content{ } .item-content{ width: 317px; - float:right + float:right; } + .item-title-time{ width: 100%; overflow: auto; @@ -99,6 +101,9 @@ ion-content{ font-size: 15px; color: #0d89d1; } + .item-title-active{ + color: #fff; +} .item-date{ width: 20%; float: right; @@ -106,10 +111,20 @@ ion-content{ color: #797979; text-align: right; } + .item-date-active{ + color: #fff; + } .item-description{ font-size: 13px; color: #000; } + .item-description-active{ + color: #fff; + } +} +.item-active{ + color: #fff !important; + background-color: #42b9fe !important; } @media only screen and (min-width: 801px) { .main-content{ @@ -142,3 +157,8 @@ ion-content{ } } + +.highlight { + color: #fff !important; + background-color: #42b9fe !important; +} diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 2e5485424..c397698bb 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -49,6 +49,7 @@ export class ChatPage implements OnInit { userDirectMessages: any[]; result:any; dmUsers:any; + idSelected: string; desktopComponent: any = { showMessages: false, @@ -177,6 +178,7 @@ hideRefreshButton(){ } } openMessagesPage(rid) { + this.idSelected = rid; if( window.innerWidth < 801){ this.openMessagesModal(rid); } @@ -220,6 +222,7 @@ hideRefreshButton(){ } openGroupMessagesPage(rid) { + this.idSelected = rid; console.log(rid); if( window.innerWidth < 801){