comment: put merge icon before avatar
This commit is contained in:
parent
ee363e3635
commit
77e2000cb3
|
@ -31,15 +31,15 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
|
|||
<label for="comment_folder_<%= comment.short_id %>"
|
||||
class="comment_folder"></label>
|
||||
|
||||
<% if defined?(was_merged) && was_merged %>
|
||||
<span class="merge"></span>
|
||||
<% end %>
|
||||
|
||||
<% if @user && @user.show_avatars? %>
|
||||
<a href="/u/<%= comment.user.username %>"><img
|
||||
src="<%= comment.user.avatar_url(16) %>" class="avatar"></a>
|
||||
<% end %>
|
||||
|
||||
<% if defined?(was_merged) && was_merged %>
|
||||
<span class="merge"></span>
|
||||
<% end %>
|
||||
|
||||
<a href="/u/<%= comment.user.username %>"
|
||||
class="<%= comment.html_class_for_user %>"><%=
|
||||
comment.user.username %></a>
|
||||
|
|
Loading…
Reference in a new issue