diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-15 15:11:06 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-15 15:11:06 +0000 |
| commit | 8f9bb2127707b62457bc35c4051d92d93dea8c3f (patch) | |
| tree | 095d66e1bcc328026f2fc2415ecb2bfba0337396 | |
| parent | 0b408219ed5992a9c85dc86a452bf1ef5faf0fd2 (diff) | |
| parent | e373ed514d3ffa8af911a9c5412ac42956d866cd (diff) | |
| download | gitlab-ce-8f9bb2127707b62457bc35c4051d92d93dea8c3f.tar.gz | |
Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'
Fix file diff title and renames alignment in discussions
Closes #31782
See merge request !12169
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 70042dee20f..4a41be972da 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -2,8 +2,9 @@ - blob = discussion.blob .diff-file.file-holder - .js-file-title.file-title - = render "projects/diffs/file_header", diff_file: diff_file, url: discussion_path(discussion), show_toggle: false + .js-file-title.file-title.file-title-flex-parent + .file-header-content + = render "projects/diffs/file_header", diff_file: diff_file, url: discussion_path(discussion), show_toggle: false .diff-content.code.js-syntax-highlight %table |