More tweaks to newsfeed

This commit is contained in:
Victoria Wang 2015-04-12 15:10:13 -07:00
parent 8b3c07b9ab
commit 43959d5185
2 changed files with 19 additions and 14 deletions

View file

@ -712,7 +712,7 @@ a.tag:hover {
border-top: 1px solid #EBEBEB; border-top: 1px solid #EBEBEB;
} }
.news-item:nth-of-type(1) { .news-item:nth-of-type(1) {
margin-top: 0!important; padding-top: 0;
border: 0; border: 0;
} }
.news-item .user { .news-item .user {
@ -727,12 +727,15 @@ a.tag:hover {
font-style: normal; font-style: normal;
font-size: .8em; font-size: .8em;
} }
.news-item.for-me .comment { .news-item.for-me .title > .comment {
color: #000; color: #000;
font-style: normal; font-style: normal;
margin-top: .2em; margin-top: -.1em;
font-size: .9em; font-size: .9em;
margin-bottom: -.1em; margin-bottom: .2em;
float: left;
clear: both;
margin-left: 61px;
} }
.news-item .icon { .news-item .icon {
width: 49px; width: 49px;

View file

@ -4,19 +4,21 @@
<div class="title"> <div class="title">
<div class="icon"><a href="/site/<%= actioning_site.username %>" class="avatar" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '50x50') %>);"></a></div> <div class="icon"><a href="/site/<%= actioning_site.username %>" class="avatar" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '50x50') %>);"></a></div>
<% if current_site && current_site.id == actioning_site.id %> <div class="text">
<a href="/site/<%= current_site.username %>" class="you">You</a> <% if current_site && current_site.id == actioning_site.id %>
<% else %>
<a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
<% end %>
<i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
<% if current_site && current_site.id == profile_comment.site_id %>
<a href="/site/<%= current_site.username %>" class="you">You</a> <a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %> <% else %>
<a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a> <a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
<% end %> <% end %>
<i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
<% if current_site && current_site.id == profile_comment.site_id %>
<a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %>
<a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
<% end %>
</div>
<span class="date"> <span class="date">
<a href="/site/<%= site.username %>?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a> <a href="/site/<%= site.username %>?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>
</span> </span>