deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move avatars to the far left

Browse source
This commit is contained in:
joshua stein 2015-07-31 10:51:33 -05:00
parent f90276acb1
commit 117aaaf3db
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/application.css
View file

@ -553,7 +553,6 @@ li .byline img.avatar {
border-radius: 8px;
height: 16px;
margin-bottom: 2px;
margin-left: 2px;
margin-right: 2px;
vertical-align: middle;
width: 16px;

8
app/views/comments/_comment.html.erb
View file

@ -30,6 +30,10 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
<a class="comment_folder"></a>
<% end %>
<% if @user && @user.show_avatars? %>
<img src="<%= comment.user.avatar_url(16) %>" class="avatar">
<% end %>
<% if defined?(was_merged) && was_merged %>
<span class="merge"></span>
<% end %>
@ -42,10 +46,6 @@ class="comment <%= comment.current_vote ? (comment.current_vote[:vote] == 1 ?
<% end %>
><%= comment.user.username %></a>
<% if @user && @user.show_avatars? %>
<img src="<%= comment.user.avatar_url(16) %>" class="avatar">
<% end %>
<% if comment.hat %>
<%= comment.hat.to_html_label %>
<% end %>

18
app/views/stories/_listdetail.html.erb
View file

@ -59,6 +59,10 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %>
break_long_words(ms.domain) %></a>
<% end %>
<span class="byline">
<% if @user && @user.show_avatars? %>
<img src="<%= ms.user.avatar_url(16) %>" class="avatar">
<% end %>
<% if story.user_is_author? %>
authored
<% end %>
@ -68,10 +72,6 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %>
class="new_user"
<% end %>><%= ms.user.username %></a>
<% if @user && @user.show_avatars? %>
<img src="<%= ms.user.avatar_url(16) %>" class="avatar">
<% end %>
<%= time_ago_in_words_label(ms.created_at, :strip_about => true) %>
ago
</span>
@ -89,6 +89,9 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %>
<% end %>
<div class="byline">
<% if @user && @user.show_avatars? %>
<img src="<%= story.user.avatar_url(16) %>" class="avatar">
<% end %>
<% if story.user_is_author? %>
authored
<% end %>
@ -96,19 +99,12 @@ class="story <%= story.vote && story.vote[:vote] == 1 ? "upvoted" : "" %>
by
<a class="<%= story.html_class_for_user(@user) %>"><%=
story.user.username %></a>
<% if @user && @user.show_avatars? %>
<img src="<%= story.user.avatar_url(16) %>" class="avatar">
<% end %>
just now
<% else %>
by
<a href="/u/<%= story.user.username %>" class="<%=
story.html_class_for_user(@user) %>"><%= story.user.username %></a>
<% if @user && @user.show_avatars? %>
<img src="<%= story.user.avatar_url(16) %>" class="avatar">
<% end %>
<%= time_ago_in_words_label(story.created_at, :strip_about => true) %>
ago