diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-16 21:46:50 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-17 01:22:09 +0300 |
| commit | 220629521aa176156260d9f8fc36cce833f2e47e (patch) | |
| tree | bb0a14fc4ca9223b439709e4cd942ca328d4e540 /app/views/projects | |
| parent | 8e0b00d4044db6405bc2cf4497b9cb50afe38d38 (diff) | |
Merge branch 'dz-fix-mr-widget-padding' into 'master'
Add bottom padding for merge request command line text
Because without bottom padding text is too close to the UI tabs - hard to navigate
See merge request !4681
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index b60bbb7532e..2ec96308fd7 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -37,7 +37,7 @@ = render "projects/merge_requests/widget/show.html.haml" - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user) - .light.prepend-top-default + .light.prepend-top-default.append-bottom-default You can also accept this merge request manually using the = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" |