diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index e1e30d57..98322673 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -712,7 +712,7 @@ a.tag:hover { border-top: 1px solid #EBEBEB; } .news-item:nth-of-type(1) { - margin-top: 0!important; + padding-top: 0; border: 0; } .news-item .user { @@ -727,12 +727,15 @@ a.tag:hover { font-style: normal; font-size: .8em; } -.news-item.for-me .comment { +.news-item.for-me .title > .comment { color: #000; font-style: normal; - margin-top: .2em; + margin-top: -.1em; font-size: .9em; - margin-bottom: -.1em; + margin-bottom: .2em; + float: left; + clear: both; + margin-left: 61px; } .news-item .icon { width: 49px; diff --git a/views/_news_profile_comment.erb b/views/_news_profile_comment.erb index 45977111..fe7afc7c 100644 --- a/views/_news_profile_comment.erb +++ b/views/_news_profile_comment.erb @@ -4,19 +4,21 @@
- <% if current_site && current_site.id == actioning_site.id %> - You - <% else %> - <% if actioning_site.supporter? %><% end %><%= actioning_site.username %> - <% end %> - - - - <% if current_site && current_site.id == profile_comment.site_id %> +
+ <% if current_site && current_site.id == actioning_site.id %> You <% else %> - <% if profile_comment.site.supporter? %><% end %><%= profile_comment.site.username %> + <% if actioning_site.supporter? %><% end %><%= actioning_site.username %> <% end %> + + + + <% if current_site && current_site.id == profile_comment.site_id %> + You + <% else %> + <% if profile_comment.site.supporter? %><% end %><%= profile_comment.site.username %> + <% end %> +
<%= profile_comment.created_at.ago %>