kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix broken layout on compare branches page

This commit is contained in:
Annabel Dunstone Gray 2018-05-09 10:24:59 -07:00
parent 780203dd73
commit dc40e2a919
No known key found for this signature in database
GPG Key ID: 7C8C78A372AD7A2D
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/pages/projects.scss
View File

@ -1006,7 +1006,7 @@ pre.light-well {
margin-top: -20px;
@include media-breakpoint-up(sm) {
margin-top: 0;
margin: 0 $gl-padding-8 0;
width: auto;
}
}

1
app/views/projects/compare/_form.html.haml
View File

@ -1,5 +1,4 @@
= form_tag project_compare_index_path(@project), method: :post, class: 'form-inline js-requires-input js-signature-container', data: { 'signatures-path' => signatures_namespace_project_compare_index_path } do
.clearfix
- if params[:to] && params[:from]
.compare-switch-container
= link_to icon('exchange'), { from: params[:to], to: params[:from] }, class: 'commits-compare-switch has-tooltip btn btn-white', title: 'Swap revisions'

2
app/views/projects/diffs/_diffs.html.haml
View File

@ -15,7 +15,7 @@
- elsif current_controller?('projects/merge_requests/diffs')
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'd-none d-sm-block')
- elsif current_controller?(:compare)
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'd-none d-sm-block')
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'd-none d-sm-inline-block')
.btn-group
= inline_diff_btn
= parallel_diff_btn