Download as
Browse Code »

Commit 80f2ef2d028b9ba2d18df47ae248caec8a7bfce3

Authored by Dmitriy Zaporozhets
1 parent 2a705c4f
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

MR index pollished

Showing 3 changed files with 19 additions and 5 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @80f2ef2
... ... @@ -429,7 +429,7 @@ form {
429 429 */
430 430 .ui-box {
431 431 background:#F9F9F9;
432   - margin-bottom: 40px;
  432 + margin-bottom: 25px;
433 433 @include round-borders-all(4px);
434 434 border-color: #CCC;
435 435  
... ...
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @80f2ef2
... ... @@ -82,3 +82,15 @@
82 82 }
83 83 }
84 84 }
  85 +
  86 +li.merge_request {
  87 + padding:7px 10px;
  88 + img.avatar {
  89 + width: 32px;
  90 + margin-top: 4px;
  91 + }
  92 + p {
  93 + padding: 0px;
  94 + padding-bottom: 2px;
  95 + }
  96 +}
... ...
app/views/merge_requests/_merge_request.html.haml
  Diff comments   View file @80f2ef2
... ... @@ -15,12 +15,14 @@
15 15 →
16 16 = merge_request.target_branch
17 17 = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
  18 +
  19 + = link_to project_merge_request_path(merge_request.project, merge_request) do
  20 + %p.row_title= truncate(merge_request.title, :length => 80)
  21 +
18 22 %span.update-author
19   - %strong= merge_request.author_name
20   - authored
  23 + %small.cdark= "##{merge_request.id}"
  24 + authored by #{merge_request.author_name}
21 25 = time_ago_in_words(merge_request.created_at)
22 26 ago
23 27 - if merge_request.upvotes > 0
24 28 %span.badge.badge-success= "+#{merge_request.upvotes}"
25   - = link_to project_merge_request_path(merge_request.project, merge_request) do
26   - %p.row_title= truncate(merge_request.title, :length => 80)
... ...