Redesign activity feed on dashboard and project pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 8428281f8f6..13347b6eec6 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -27,16 +27,14 @@ module EventsHelper
     key = key.to_s
     active = 'active' if @event_filter.active?(key)
     link_opts = {
-      class: 'event_filter_link',
+      class: "event-filter-link btn btn-default #{active}",
       id:    "#{key}_event_filter",
       title: "Filter by #{tooltip.downcase}",
       data:  { toggle: 'tooltip', placement: 'top' }
     }
 
-    content_tag :li, class: "filter_icon #{active}" do
-      link_to request.path, link_opts do
-        icon(icon_for_event[key]) + content_tag(:span, ' ' + tooltip)
-      end
+    link_to request.path, link_opts do
+      content_tag(:span, ' ' + tooltip)
     end
   end
 
@@ -66,7 +64,7 @@ module EventsHelper
       end
       words << "at"
     elsif event.target
-      words << "##{event.target_iid}:" 
+      words << "##{event.target_iid}:"
       words << event.target.title if event.target.respond_to?(:title)
       words << "at"
     end