Skip to content

Commit 6ef50a6

Browse files
author
Danny Yan
committed
Moved the timestamp after the message
1 parent ceffdbe commit 6ef50a6

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

app/components/message-list/message-list.html

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,20 @@ <h2>{{
1919
messageGroup[0].sender === messageList.userInfo.id ?
2020
'You' :
2121
messageList.contacts[messageGroup[0].sender].userInfo.displayName
22-
}} at {{
23-
messageGroup[0].sender === messageList.userInfo.id ?
24-
messageGroup[0].sentTime : messageGroup[0].receivedTime |
25-
date : 'short'
2622
}}</h2>
27-
<p ng-repeat="message in messageGroup track by message.id"
28-
class="toc-message"
23+
<div class="row toc-message" ng-repeat="message in messageGroup track by message.id"
2924
ng-class="{'toc-unread-message': !message.isRead}">
30-
{{message.content}}
31-
</p>
25+
<p class="col toc-message-content">
26+
{{message.content}}
27+
</p>
28+
<p class="col col-20 toc-message-timestamp">
29+
{{
30+
message.sender === messageList.userInfo.id ?
31+
message.sentTime : message.receivedTime |
32+
date : 'shortTime'
33+
}}
34+
</p>
35+
</div>
3236
</div>
3337
</div>
3438
</div>
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
p.toc-message {
2-
white-space: initial;
3-
overflow: initial;
4-
text-overflow: initial;
52
&.toc-unread-message {
63
font-weight: bold;
74
}
85
}
6+
7+
p.toc-message-content {
8+
white-space: normal;
9+
overflow: initial;
10+
text-overflow: initial;
11+
padding: 0px;
12+
13+
}
14+
15+
p.toc-message-timestamp {
16+
padding: 0px;
17+
text-align: right;
18+
}

0 commit comments

Comments
 (0)