Render small avatars for inline events

diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index 9b049ae..d94d97c 100644 (file)
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -35,6 +35,13 @@
     padding-top: 0;
   }
 
+  &.event-inline {
+    .avatar {
+      width: 16px;
+      height: 16px;
+    }
+  }
+
   padding: 14px 0px;
   border-bottom: 1px solid #eee;
   .event-title {

diff --git a/app/models/event.rb b/app/models/event.rb
index 759e84b..5c7c5be 100644 (file)
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base
       "Wall"
     end.downcase
   end
+
+  def body?
+    if push?
+      push_with_commits?
+    elsif note?
+      true
+    else
+      target.respond_to? :title
+    end
+  end
 end

diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index b090148..b354346 100644 (file)
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,5 +1,5 @@
 - if event.proper?
-  %div.event-item
+  .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
     %span.cgray.pull-right
       #{time_ago_in_words(event.created_at)} ago.