From 9cc9b0e5d72866a398f160b181cb3f54cb821f66 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Tue, 21 Oct 2014 17:40:49 -0700
Subject: [PATCH] Removed actions from follow events, style changes to news
 feed

---
 sass/_project-sass/_project-Main.scss | 18 +++++++-----------
 views/_news.erb                       |  4 +++-
 views/site.erb                        |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 040aca5a..10857450 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -513,18 +513,10 @@ a.tag:hover {
 .news-item {
   width: 100%;
   float: left;
-  margin: 1em 0;
+  margin: 1.25em 0 1.25em 0;
 }
-/*
-.news-item.update, .news-item.tags, .news-item.comment.for-me, .news-item.tip.for-me {
-  margin: 1.0em 0;
-}
-*/
 .news-item:nth-of-type(1) {
-  margin-top: 0;
-}
-.news-item.first {
-  margin-top: 0;
+  margin-top: 0!important;
 }
 .news-item .user {
   font-weight: bold;
@@ -540,7 +532,8 @@ a.tag:hover {
   font-style: normal;
   margin-top: .2em;
   font-size: .9em;
-  margin-bottom: -.4em;
+  margin-bottom: -.1em;
+  margin-left: 2.35em;
 }
 .news-item .icon {
   width: 20px;
@@ -568,6 +561,9 @@ a.tag:hover {
 .news-item.tip .icon {
   background: #FFCC00;
 }
+.news-item.follow {
+  margin: .3em 0 .3em 0;
+}
 .news-item.follow .icon {
   background: #3399CC;
 }
diff --git a/views/_news.erb b/views/_news.erb
index 43198ff8..75acd7c5 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -80,7 +80,9 @@
       <% end %>
   <% end %>
 
-  <%== erb :'_news_actions', layout: false, locals: {event: event} %>
+  <% if !event.follow_id %>
+    <%== erb :'_news_actions', layout: false, locals: {event: event} %>
+  <% end %>
 
   <% if event.comments_dataset.count > 0 %>
     <div class="content">
diff --git a/views/site.erb b/views/site.erb
index ba750837..03c18a72 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -90,7 +90,7 @@
       </div>
       <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
     <% else %>
-      <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
+      <div><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
     <% end %>
 
   </div>