diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 16:50:40 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-09 16:50:40 -0500 |
| commit | 9bcf8f43c6e50f4e00bda6fd693bd0bbd8a1fc4d (patch) | |
| tree | 76790e8fb679e5c644af5fec698029f68fdd12ac /app/views/projects/diffs | |
| parent | 35991d16629559f2fd67be706fc80088dfb64638 (diff) | |
| download | gitlab-ce-9bcf8f43c6e50f4e00bda6fd693bd0bbd8a1fc4d.tar.gz | |
[skip ci] Replace hidden-xs
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 4de42f1a090..ccecff72aa7 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -11,11 +11,11 @@ = link_to 'Expand all', url_for(params.merge(expanded: 1, format: nil)), class: 'btn btn-secondary' - if show_whitespace_toggle - if current_controller?(:commit) - = commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs') + = commit_diff_whitespace_link(diffs.project, @commit, class: 'd-none d-sm-block') - elsif current_controller?('projects/merge_requests/diffs') - = diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs') + = 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: 'hidden-xs') + = diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'd-none d-sm-block') .btn-group = inline_diff_btn = parallel_diff_btn diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index 47bfcb21cf4..b4df654c839 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -10,7 +10,7 @@ - unless diff_file.submodule? - blob = diff_file.blob - .file-actions.hidden-xs + .file-actions.d-none.d-sm-block - if blob&.readable_text? = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') |