show a byline for for merged stories

This commit is contained in:
joshua stein 2015-01-01 18:54:26 -06:00
parent 0b85f3db23
commit 439f5702ee
2 changed files with 12 additions and 0 deletions

View file

@ -532,6 +532,9 @@ li .byline {
li.story .byline {
margin-top: 1px;
}
li.story span.byline {
margin-left: 0.5em;
}
li .byline a {
color: #888;
text-decoration: none;

View file

@ -48,6 +48,15 @@ class="story <%= story.vote == 1 ? "upvoted" : "" %> <%= story.vote == -1 ?
<% end %>
</span>
<span class="domain"><%= ms.domain %></span>
<span class="byline">
by <a href="/u/<%= ms.user.username %>"
<% if ms.user.is_new? %>
class="new_user"
<% end %>><%= ms.user.username %></a>
<%= raw(time_ago_in_words_label(ms.created_at).gsub(/^about /, ""))
%> ago
</span>
<% end %>
<% end %>
<% end %>