Commit 8290c9a6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use proper classes for sdiff content

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 58634dfb
...@@ -36,18 +36,14 @@ ...@@ -36,18 +36,14 @@
.discussion-body .discussion-body
- if note.for_diff_line? - if note.for_diff_line?
- if note.active? - if note.active?
.content = render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
.file= render "projects/notes/discussion_diff", discussion_notes: discussion_notes, note: note
- else - else
= link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion' = link_to 'show outdated discussion', '#', class: 'js-show-outdated-discussion'
%div.hide.outdated-discussion %div.hide.outdated-discussion
.content
.notes{ rel: discussion_notes.first.discussion_id } .notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes = render discussion_notes
- else - else
.content
.notes{ rel: discussion_notes.first.discussion_id } .notes{ rel: discussion_notes.first.discussion_id }
= render discussion_notes = render discussion_notes
= render "projects/notes/discussion_reply_button", note: discussion_notes.first = render "projects/notes/discussion_reply_button", note: discussion_notes.first
...@@ -59,4 +55,3 @@ ...@@ -59,4 +55,3 @@
= link_to "javascript:;", class: "js-details-target js-toggler-target" do = link_to "javascript:;", class: "js-details-target js-toggler-target" do
%i.icon-eye-open %i.icon-eye-open
Show Show
- diff = note.diff - diff = note.diff
.header .diff-file
.diff-header
- if diff.deleted_file - if diff.deleted_file
%span= diff.old_path %span= diff.old_path
- else - else
...@@ -7,7 +8,7 @@ ...@@ -7,7 +8,7 @@
- if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
%span.file-mode= "#{diff.a_mode}#{diff.b_mode}" %span.file-mode= "#{diff.a_mode}#{diff.b_mode}"
%br/ %br/
.content .diff-content
%table %table
- each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old| - each_diff_line_near(diff, note.diff_file_index, note.line_code) do |line, type, line_code, line_new, line_old|
%tr.line_holder{ id: line_code } %tr.line_holder{ id: line_code }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment