diff --git a/app/assets/images/event_mr_merged.png b/app/assets/images/event_mr_merged.png new file mode 100644 index 0000000000000000000000000000000000000000..30aea0b6e55985cc8e881d952d1f4282cc80a046 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 0000000000000000000000000000000000000000..930faee6aa2a441ab0805910cf815212f95cfe83 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 c7112de31208f468d5f7578411ddebd415e630b4..ca797ed06f4fdebd37f436785267508d47514bbb 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 b60662c0b4b91a887269691e031ac0755da0f2ce..16517dc73bea4a29a9e509a1c044dd054c2ba2ab 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 24951991dd399218c53c08309405fabe536108a5..feb02e1febc819cb3bddaa1b20127b0e3aef87b0 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 ecb0e9ff394cb8b0ea6e1d35af7daf0f846643b0..5c1c66e0afb14cf17a0a1b13f0f45f8a15795736 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 a94dc653dd8cf9b26fa7db77372e9dc4c39cd3dc..aff66385681db20d0cbe5ee9f6a51b586280f05c 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