Commit 860e3ab5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Event feed: Icons for some events

parent 1e4d15b4
...@@ -645,6 +645,13 @@ p.time { ...@@ -645,6 +645,13 @@ p.time {
.avatar { .avatar {
width:32px; width:32px;
} }
.event_icon {
float:right;
margin-right:2px;
img {
width:20px;
}
}
ul { ul {
margin-left:50px; margin-left:50px;
margin-bottom:5px; margin-bottom:5px;
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
.project_name { .project_name {
float:left; float:left;
width:360px;
margin:0; margin:0;
margin-right:30px; margin-right:30px;
font-size:20px; font-size:20px;
......
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
} }
.project_name { .project_name {
float:left; float:left;
width:360px;
margin:0; margin:0;
margin-right:30px; margin-right:30px;
font-size:20px; font-size:20px;
......
- if event.action_name == "merged"
.event_icon= image_tag "event_mr_merged.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar" = image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name} %strong #{event.author_name}
%span.event_label= event.action_name %span.event_label= event.action_name
......
%div %div
.event_icon= image_tag "event_push.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar" = image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name} %strong #{event.author_name}
%span.event_label= event.push_action_name %span.event_label= event.push_action_name
= event.ref_type
= link_to project_commits_path(event.project, :ref => event.ref_name) do = link_to project_commits_path(event.project, :ref => event.ref_name) do
%strong= event.ref_name %strong= event.ref_name
at at
......
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