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

Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'
8f9bb212 · Annabel Dunstone Gray · 0b408219 · e373ed51 · 8f9bb212
Commit 8f9bb212 authored Jun 15, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

_diff_with_notes.html.haml app/views/discussions/_diff_with_notes.html.haml +3 -2

No files found.
--- 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