diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index 70f45654f..0df4fc616 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -80,7 +80,7 @@ border: 0px; display:inline-block; width: 27%; - padding: 6px 0px; + padding: 9px 0px; text-align:left; border-radius: 100px; color: $black; diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index f1c2821bd..377a053e4 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -14,7 +14,7 @@ class NotificationsController < ApplicationController order("notified_at DESC").limit(55).to_a) elsif params[:filter].to_s.downcase == "comments" @notifications = NotificationDecorator. - decorate_collection(Notification.where(user_id: current_user.id, notifiable_type: "Comment"). + decorate_collection(Notification.where(user_id: current_user.id, notifiable_type: "Comment", action: nil). # Nil action means not reaction in this context order("notified_at DESC").limit(55).to_a) else @notifications = NotificationDecorator. diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index d62485eb9..b829cb7da 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -50,6 +50,8 @@