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

MR index pollished

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-07-17 08:17:16 +03:00
parent 2a705c4f40
commit 80f2ef2d02
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/gitlab_bootstrap.scss
View file

@ -429,7 +429,7 @@ form {
*/ */
.ui-box { .ui-box {
background:#F9F9F9; background:#F9F9F9;
margin-bottom: 40px; margin-bottom: 25px;
@include round-borders-all(4px); @include round-borders-all(4px);
border-color: #CCC; border-color: #CCC;

12
app/assets/stylesheets/sections/merge_requests.scss
View file

@ -82,3 +82,15 @@
} }
} }
} }
li.merge_request {
padding:7px 10px;
img.avatar {
width: 32px;
margin-top: 4px;
}
p {
padding: 0px;
padding-bottom: 2px;
}
}

10
app/views/merge_requests/_merge_request.html.haml
View file

@ -15,12 +15,14 @@
→ →
= merge_request.target_branch = merge_request.target_branch
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar" = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
= link_to project_merge_request_path(merge_request.project, merge_request) do
%p.row_title= truncate(merge_request.title, :length => 80)
%span.update-author %span.update-author
%strong= merge_request.author_name %small.cdark= "##{merge_request.id}"
authored authored by #{merge_request.author_name}
= time_ago_in_words(merge_request.created_at) = time_ago_in_words(merge_request.created_at)
ago ago
- if merge_request.upvotes > 0 - if merge_request.upvotes > 0
%span.badge.badge-success= "+#{merge_request.upvotes}" %span.badge.badge-success= "+#{merge_request.upvotes}"
= link_to project_merge_request_path(merge_request.project, merge_request) do
%p.row_title= truncate(merge_request.title, :length => 80)