deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Event feed: Icons for some events

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-05-19 12:25:16 +03:00
parent 1e4d15b406
commit 860e3ab526
7 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/event_mr_merged.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 463 B

BIN
app/assets/images/event_push.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 632 B

7
app/assets/stylesheets/common.scss
View file

@ -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;

1
app/assets/stylesheets/ui_basic.scss
View file

@ -83,7 +83,6 @@
.project_name {
float:left;
width:360px;
margin:0;
margin-right:30px;
font-size:20px;

1
app/assets/stylesheets/ui_mars.scss
View file

@ -97,7 +97,6 @@
}
.project_name {
float:left;
width:360px;
margin:0;
margin-right:30px;
font-size:20px;

2
app/views/events/_event_merge_request.html.haml
View file

@ -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

2
app/views/events/_event_push.html.haml
View file

@ -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