Moved the timestamp after the message

lewisl9029 · May 7, 2015 · 6ef50a6 · 6ef50a6
1 parent ceffdbe
commit 6ef50a6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/app/components/message-list/message-list.html b/app/components/message-list/message-list.html
@@ -19,16 +19,20 @@ <h2>{{
         messageGroup[0].sender === messageList.userInfo.id ?
         'You' :
         messageList.contacts[messageGroup[0].sender].userInfo.displayName
-      }} at {{
-        messageGroup[0].sender === messageList.userInfo.id ?
-        messageGroup[0].sentTime : messageGroup[0].receivedTime |
-        date : 'short'
       }}</h2>
-      <p ng-repeat="message in messageGroup track by message.id"
-        class="toc-message"
+      <div class="row toc-message" ng-repeat="message in messageGroup track by message.id"
         ng-class="{'toc-unread-message': !message.isRead}">
-        {{message.content}}
-      </p>
+        <p class="col toc-message-content">
+          {{message.content}}
+        </p>
+        <p class="col col-20 toc-message-timestamp">
+          {{
+            message.sender === messageList.userInfo.id ?
+            message.sentTime : message.receivedTime |
+            date : 'shortTime'
+          }}
+        </p>
+      </div>
     </div>
   </div>
 </div>
diff --git a/app/components/message-list/message-list.scss b/app/components/message-list/message-list.scss
@@ -1,8 +1,18 @@
 p.toc-message {
-  white-space: initial;
-  overflow: initial;
-  text-overflow: initial;
   &.toc-unread-message {
     font-weight: bold;
   }
 }
+
+p.toc-message-content {
+  white-space: normal;
+  overflow: initial;
+  text-overflow: initial;
+  padding: 0px;
+
+}
+
+p.toc-message-timestamp {
+  padding: 0px;
+  text-align: right;
+}