Fixed issue with overlapping text and timestamp.

longsleep · longsleep · commit d51e29165786 · 2014-05-27T11:19:32.000+02:00
diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
@@ -297,6 +297,11 @@
     text-align: right;
     top: 8px;
   }
+  .timestamp-space {
+    width:40px;
+    height:10px;
+    float:right;
+  }
   strong {
     display: block;
     padding-bottom: 2px;
diff --git a/static/js/controllers/chatroomcontroller.js b/static/js/controllers/chatroomcontroller.js
@@ -192,7 +192,9 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
 				}
 				lastMessageContainer = $("<ul>").appendTo(container);
 				if ($.trim(s)) {
-					element = $("<li>").html(s).appendTo(lastMessageContainer);
+					element = $("<li>").html(s);
+					element.prepend('<div class="timestamp-space">');
+					element.appendTo(lastMessageContainer);
 				}
 			}
 			if (nodes) {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,9 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome`
`192`	`192`	`}`
`193`	`193`	`lastMessageContainer = $("<ul>").appendTo(container);`
`194`	`194`	`if ($.trim(s)) {`
`195`		`- element = $("<li>").html(s).appendTo(lastMessageContainer);`
	`195`	`+ element = $("<li>").html(s);`
	`196`	`+ element.prepend('<div class="timestamp-space">');`
	`197`	`+ element.appendTo(lastMessageContainer);`
`196`	`198`	`}`
`197`	`199`	`}`
`198`	`200`	`if (nodes) {`