diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-19 12:25:16 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-05-19 12:25:56 +0300 |
| commit | 860e3ab526bbcccd64aac45fa377c14e78ef345c (patch) | |
| tree | 05ba5e0b1d11d5b5f53976b5ec0cf67b032c48bd | |
| parent | 1e4d15b406de131d1260f1477d0077c6f5e93ddd (diff) | |
| download | gitlab-ce-860e3ab526bbcccd64aac45fa377c14e78ef345c.tar.gz | |
Event feed: Icons for some events
| -rw-r--r-- | app/assets/images/event_mr_merged.png | bin | 0 -> 463 bytes | |||
| -rw-r--r-- | app/assets/images/event_push.png | bin | 0 -> 632 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/common.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/ui_basic.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/ui_mars.scss | 1 | ||||
| -rw-r--r-- | app/views/events/_event_merge_request.html.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_push.html.haml | 2 |
7 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/images/event_mr_merged.png b/app/assets/images/event_mr_merged.png Binary files differnew file mode 100644 index 00000000000..30aea0b6e55 --- /dev/null +++ b/app/assets/images/event_mr_merged.png diff --git a/app/assets/images/event_push.png b/app/assets/images/event_push.png Binary files differnew file mode 100644 index 00000000000..930faee6aa2 --- /dev/null +++ b/app/assets/images/event_push.png diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c7112de3120..ca797ed06f4 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 b60662c0b4b..16517dc73be 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 24951991dd3..feb02e1febc 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 ecb0e9ff394..5c1c66e0afb 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 a94dc653dd8..aff66385681 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 |
