diff --git a/app/assets/images/event_mr_merged.png b/app/assets/images/event_mr_merged.png new file mode 100644 index 0000000..30aea0b Binary files /dev/null and b/app/assets/images/event_mr_merged.png differ diff --git a/app/assets/images/event_push.png b/app/assets/images/event_push.png new file mode 100644 index 0000000..930faee Binary files /dev/null and b/app/assets/images/event_push.png differ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c7112de..ca797ed 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -645,6 +645,13 @@ p.time { .avatar { width:32px; } + .event_icon { + float:right; + margin-right:2px; + img { + width:20px; + } + } ul { margin-left:50px; margin-bottom:5px; diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index b60662c..16517dc 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -83,7 +83,6 @@ .project_name { float:left; - width:360px; margin:0; margin-right:30px; font-size:20px; diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss index 2495199..feb02e1 100644 --- a/app/assets/stylesheets/ui_mars.scss +++ b/app/assets/stylesheets/ui_mars.scss @@ -97,7 +97,6 @@ } .project_name { float:left; - width:360px; margin:0; margin-right:30px; font-size:20px; diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml index ecb0e9f..5c1c66e 100644 --- a/app/views/events/_event_merge_request.html.haml +++ b/app/views/events/_event_merge_request.html.haml @@ -1,3 +1,5 @@ +- if event.action_name == "merged" + .event_icon= image_tag "event_mr_merged.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" %strong #{event.author_name} %span.event_label= event.action_name diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml index a94dc65..aff6638 100644 --- a/app/views/events/_event_push.html.haml +++ b/app/views/events/_event_push.html.haml @@ -1,7 +1,9 @@ %div + .event_icon= image_tag "event_push.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" %strong #{event.author_name} %span.event_label= event.push_action_name + = event.ref_type = link_to project_commits_path(event.project, :ref => event.ref_name) do %strong= event.ref_name at -- libgit2 0.21.2