diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 8197590f5a2a6b28fafcfdd38ea3108360c9614f..119180c5abb3abfae9254fe7c8b5c6aa651d0b6d 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -429,7 +429,7 @@ form { */ .ui-box { background:#F9F9F9; - margin-bottom: 40px; + margin-bottom: 25px; @include round-borders-all(4px); border-color: #CCC; diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index ad496238a13957ede4b20c094f95b3f518276670..34f43acf839d1356a8a9b5d7a076e40e5b0553ce 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -82,3 +82,15 @@ } } } + +li.merge_request { + padding:7px 10px; + img.avatar { + width: 32px; + margin-top: 4px; + } + p { + padding: 0px; + padding-bottom: 2px; + } +} diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index d9634a4fcc831f2e558911d24334965dfcb4a774..b9a005e08be40a750ee4ad6e1b1e2456c857240b 100644 --- a/app/views/merge_requests/_merge_request.html.haml +++ b/app/views/merge_requests/_merge_request.html.haml @@ -15,12 +15,14 @@ → = merge_request.target_branch = 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 - %strong= merge_request.author_name - authored + %small.cdark= "##{merge_request.id}" + authored by #{merge_request.author_name} = time_ago_in_words(merge_request.created_at) ago - if merge_request.upvotes > 0 %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)