Commit 25e629e4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Render small avatars for inline events

parent 9174020f
...@@ -35,6 +35,13 @@ ...@@ -35,6 +35,13 @@
padding-top: 0; padding-top: 0;
} }
&.event-inline {
.avatar {
width: 16px;
height: 16px;
}
}
padding: 14px 0px; padding: 14px 0px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
.event-title { .event-title {
......
...@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base ...@@ -291,4 +291,14 @@ class Event < ActiveRecord::Base
"Wall" "Wall"
end.downcase end.downcase
end end
def body?
if push?
push_with_commits?
elsif note?
true
else
target.respond_to? :title
end
end
end end
- if event.proper? - if event.proper?
%div.event-item .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
%span.cgray.pull-right %span.cgray.pull-right
#{time_ago_in_words(event.created_at)} ago. #{time_ago_in_words(event.created_at)} ago.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment