Skip to content

Commit

Permalink
Fixed issue with overlapping text and timestamp.
Browse files Browse the repository at this point in the history
  • Loading branch information
longsleep committed May 27, 2014
1 parent 6acba13 commit d51e291
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions src/styles/components/_chat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,11 @@
text-align: right;
top: 8px;
}
.timestamp-space {
width:40px;
height:10px;
float:right;
}
strong {
display: block;
padding-bottom: 2px;
Expand Down
4 changes: 3 additions & 1 deletion static/js/controllers/chatroomcontroller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit d51e291

Please sign in to comment.