Commit 494cd02b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Colored labels for events on dashboard

parent a3bb9ca1
...@@ -303,9 +303,20 @@ table.no-borders { ...@@ -303,9 +303,20 @@ table.no-borders {
} }
.event_label { .event_label {
background: #FCEEC1; @extend .label;
padding: 2px 2px 0; background-color: #999;
font-family: monospace;
&.pushed {
background-color: #3A87AD;
}
&.opened {
background-color: #468847;
}
&.closed {
background-color: #B94A48;
}
} }
img.avatar { img.avatar {
......
= 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{:class => event.action_name}= event.action_name
 issue issue
= link_to project_issue_path(event.project, event.issue) do = link_to project_issue_path(event.project, event.issue) do
%strong= truncate event.issue_title %strong= truncate event.issue_title
at at
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
.event_icon= image_tag "event_mr_merged.png" .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{:class => event.action_name}= event.action_name
 merge request merge request
= link_to project_merge_request_path(event.project, event.merge_request) do = link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title %strong= truncate event.merge_request_title
at at
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.event_icon= image_tag "event_push.png" .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.pushed= event.push_action_name
= event.ref_type = 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
......
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