diff options
| author | Koen Punt <koen@koenpunt.nl> | 2012-12-01 13:49:21 +0100 |
|---|---|---|
| committer | Koen Punt <koen@koenpunt.nl> | 2013-01-27 18:27:32 +0100 |
| commit | e33debc2147966525246bad999d0cacc4e676585 (patch) | |
| tree | c97b0aab18d179ed017f4273f6813b97c8ad81a2 /app/views/notes | |
| parent | 6ab6c55de5516ac636b5ca1147c1d1f81831c599 (diff) | |
| download | gitlab-ce-e33debc2147966525246bad999d0cacc4e676585.tar.gz | |
Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
Diffstat (limited to 'app/views/notes')
| -rw-r--r-- | app/views/notes/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notes/_discussion_diff.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notes/_discussion.html.haml b/app/views/notes/_discussion.html.haml index a9a11fc2d7e..24cb4228174 100644 --- a/app/views/notes/_discussion.html.haml +++ b/app/views/notes/_discussion.html.haml @@ -38,7 +38,7 @@ - if note.for_diff_line? - if note.diff .content - .diff_file= render "notes/discussion_diff", discussion_notes: discussion_notes, note: note + .file= render "notes/discussion_diff", discussion_notes: discussion_notes, note: note - else = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion' %div.hide.outdated-discussion diff --git a/app/views/notes/_discussion_diff.html.haml b/app/views/notes/_discussion_diff.html.haml index 93ab59c72c5..790b77333d5 100644 --- a/app/views/notes/_discussion_diff.html.haml +++ b/app/views/notes/_discussion_diff.html.haml @@ -1,5 +1,5 @@ - diff = note.diff -.diff_file_header +.header - if diff.deleted_file %span= diff.old_path - else @@ -7,7 +7,7 @@ - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" %br/ -.diff_file_content +.content %table - each_diff_line(diff, note.diff_file_index) do |line, type, line_code, line_new, line_old| %tr.line_holder{ id: line_code } |