Commit 860e3ab526bbcccd64aac45fa377c14e78ef345c
1 parent
1e4d15b4
Exists in
master
and in
4 other branches
Event feed: Icons for some events
Showing
7 changed files
with
11 additions
and
2 deletions
Show diff stats
463 Bytes
632 Bytes
app/assets/stylesheets/common.scss
| @@ -645,6 +645,13 @@ p.time { | @@ -645,6 +645,13 @@ p.time { | ||
| 645 | .avatar { | 645 | .avatar { |
| 646 | width:32px; | 646 | width:32px; |
| 647 | } | 647 | } |
| 648 | + .event_icon { | ||
| 649 | + float:right; | ||
| 650 | + margin-right:2px; | ||
| 651 | + img { | ||
| 652 | + width:20px; | ||
| 653 | + } | ||
| 654 | + } | ||
| 648 | ul { | 655 | ul { |
| 649 | margin-left:50px; | 656 | margin-left:50px; |
| 650 | margin-bottom:5px; | 657 | margin-bottom:5px; |
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_mars.scss
app/views/events/_event_merge_request.html.haml
| 1 | +- if event.action_name == "merged" | ||
| 2 | + .event_icon= image_tag "event_mr_merged.png" | ||
| 1 | = image_tag gravatar_icon(event.author_email), :class => "avatar" | 3 | = image_tag gravatar_icon(event.author_email), :class => "avatar" |
| 2 | %strong #{event.author_name} | 4 | %strong #{event.author_name} |
| 3 | %span.event_label= event.action_name | 5 | %span.event_label= event.action_name |
app/views/events/_event_push.html.haml
| 1 | %div | 1 | %div |
| 2 | + .event_icon= image_tag "event_push.png" | ||
| 2 | = image_tag gravatar_icon(event.author_email), :class => "avatar" | 3 | = image_tag gravatar_icon(event.author_email), :class => "avatar" |
| 3 | %strong #{event.author_name} | 4 | %strong #{event.author_name} |
| 4 | %span.event_label= event.push_action_name | 5 | %span.event_label= event.push_action_name |
| 6 | + = event.ref_type | ||
| 5 | = link_to project_commits_path(event.project, :ref => event.ref_name) do | 7 | = link_to project_commits_path(event.project, :ref => event.ref_name) do |
| 6 | %strong= event.ref_name | 8 | %strong= event.ref_name |
| 7 | at | 9 | at |