Fixed merge request changes sticky container not spreading full width
This commit is contained in:
parent
0ec87b3bf0
commit
81fd197c64
|
|
@ -35,7 +35,7 @@
|
|||
.commit-box,
|
||||
.info-well,
|
||||
.commit-ci-menu,
|
||||
.files-changed,
|
||||
.files-changed-inner,
|
||||
.limited-header-width,
|
||||
.limited-width-notes {
|
||||
@extend .fixed-width-container;
|
||||
|
|
|
|||
|
|
@ -4,20 +4,21 @@
|
|||
- diff_files = diffs.diff_files
|
||||
|
||||
.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
|
||||
.inline-parallel-buttons
|
||||
- if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? }
|
||||
= link_to 'Expand all', url_for(params.merge(expanded: 1, format: nil)), class: 'btn btn-default'
|
||||
- if show_whitespace_toggle
|
||||
- if current_controller?(:commit)
|
||||
= commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
|
||||
- elsif current_controller?('projects/merge_requests/diffs')
|
||||
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
|
||||
- elsif current_controller?(:compare)
|
||||
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'hidden-xs')
|
||||
.btn-group
|
||||
= inline_diff_btn
|
||||
= parallel_diff_btn
|
||||
= render 'projects/diffs/stats', diff_files: diff_files
|
||||
.files-changed-inner
|
||||
.inline-parallel-buttons
|
||||
- if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? }
|
||||
= link_to 'Expand all', url_for(params.merge(expanded: 1, format: nil)), class: 'btn btn-default'
|
||||
- if show_whitespace_toggle
|
||||
- if current_controller?(:commit)
|
||||
= commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
|
||||
- elsif current_controller?('projects/merge_requests/diffs')
|
||||
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
|
||||
- elsif current_controller?(:compare)
|
||||
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'hidden-xs')
|
||||
.btn-group
|
||||
= inline_diff_btn
|
||||
= parallel_diff_btn
|
||||
= render 'projects/diffs/stats', diff_files: diff_files
|
||||
|
||||
- if render_overflow_warning?(diff_files)
|
||||
= render 'projects/diffs/warning', diff_files: diffs
|
||||
|
|
|
|||
Loading…
Reference in New Issue