Differentiate between event types

This commit is contained in:
Annabel Dunstone Gray 2017-03-31 15:39:31 -05:00
parent b90f83e933
commit 633457563a
6 changed files with 23 additions and 14 deletions

View File

@ -4,7 +4,7 @@
*/
.event-item {
font-size: $gl-font-size;
padding: $gl-padding;
padding: $gl-padding 0;
border-bottom: 1px solid $white-normal;
color: $list-text-color;
@ -25,6 +25,11 @@
color: $list-text-color;
}
.event-icon {
display: inline-block;
margin: 0 10px;
}
svg {
height: 16px;
width: 16px;

View File

@ -4,13 +4,10 @@
#{time_ago_with_tooltip(event.created_at)}
- if event.created_project?
= custom_icon("icon_status_open")
= render "events/event/created_project", event: event
- elsif event.push?
= custom_icon("icon_commit")
= render "events/event/push", event: event
- elsif event.commented?
= custom_icon("comment_o")
= render "events/event/note", event: event
- else
= render "events/event/common", event: event

View File

@ -1,11 +1,13 @@
- if event.target
- if event.target_type == "MergeRequest"
- if event.action_name == "opened"
- if event.action_name == "opened"
.event-icon.open-icon
= custom_icon("icon_status_open")
- elsif event.action_name == "closed"
= custom_icon("icon_status_closed")
- else
= custom_icon("code_fork")
- elsif event.action_name == "closed"
.event-icon.closed-icon
= custom_icon("icon_status_closed")
- else
.event-icon.fork-icon
= custom_icon("code_fork")
.event-title
%span{ class: event.action_name }

View File

@ -1,5 +1,7 @@
.event-icon.open-icon
= custom_icon("icon_status_open")
.event-title
%span.author_name= link_to_author event
%span{ class: event.action_name }
= event_action_name(event)

View File

@ -1,5 +1,7 @@
.event-icon
= custom_icon("comment_o")
.event-title
%span.author_name= link_to_author event
= event.action_name
= event_note_title_html(event)

View File

@ -1,7 +1,9 @@
- project = event.project
.event-icon
= custom_icon("icon_commit")
.event-title
%span.author_name= link_to_author event
%span.pushed #{event.action_name} #{event.ref_type}
%strong
- commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name)
@ -48,4 +50,3 @@
.event-body
%ul.well-list.event_commits
= render "events/commit", commit: last_commit, project: project, event: event