diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-18 18:56:45 +0100 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-19 14:44:06 -0600 |
| commit | 2bb2544ecaf37a02e4055194e90405dc1ffca094 (patch) | |
| tree | 4f7992d8959b5ac34b40fdea286ec5adda8d2fce /app/views/projects/diffs | |
| parent | 28b4407bded6dd526bfafa5e498b4ac109fec7f7 (diff) | |
| download | gitlab-ce-2bb2544ecaf37a02e4055194e90405dc1ffca094.tar.gz | |
Use flexbox instead of media queries
Move CSS to correct file
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c37a33bbcd5..430f7878839 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -1,9 +1,9 @@ .diff-file.file-holder{ id: file_hash, data: diff_file_html_data(project, diff_file.file_path, diff_commit.id) } - .file-title + .file-title-flex-parent = render "projects/diffs/file_header", diff_file: diff_file, blob: blob, diff_commit: diff_commit, project: project, url: "##{file_hash}" - unless diff_file.submodule? - .file-actions.hidden-xs + .file-actions-fixed.hidden-xs - if blob_text_viewable?(blob) = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip btn-file-option', title: "Toggle comments for this file", disabled: @diff_notes_disabled do = icon('comment') |