diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2019-04-02 20:10:49 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2019-04-12 00:14:23 +0300 |
| commit | e68f94cda77d4039a15c74dd94a528966cef0557 (patch) | |
| tree | cfb93e5e836aa4dfc38bd486e07b64822b1a54fc /app/views/discussions | |
| parent | e605d8c95d39cb361d69b4a122f9e34bc7d2677d (diff) | |
| download | gitlab-ce-e68f94cda77d4039a15c74dd94a528966cef0557.tar.gz | |
Rename selector for framework notes
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_diff_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/discussions/_parallel_diff_discussion.html.haml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml index 6b8dd156874..5a47040874f 100644 --- a/app/views/discussions/_diff_discussion.html.haml +++ b/app/views/discussions/_diff_discussion.html.haml @@ -4,6 +4,6 @@ -# Text diff discussions - expanded = local_assigns.fetch(:expanded, true) %tr.notes_holder{ class: ('hide' unless expanded) } - %td.notes_content{ colspan: 3 } + %td.notes-content{ colspan: 3 } .content{ class: ('hide' unless expanded) } = render partial: "discussions/notes", collection: discussions, as: :discussion, locals: { disable_collapse_class: true } diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml index 2e621c4082d..03b428714b9 100644 --- a/app/views/discussions/_parallel_diff_discussion.html.haml +++ b/app/views/discussions/_parallel_diff_discussion.html.haml @@ -1,17 +1,17 @@ - expanded = [*discussions_left, *discussions_right].any?(&:expanded?) %tr.notes_holder{ class: ('hide' unless expanded) } - if discussions_left - %td.notes_content.parallel.old{ colspan: 2 } + %td.notes-content.parallel.old{ colspan: 2 } .content{ class: ('hide' unless discussions_left.any?(&:expanded?)) } = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old', locals: { disable_collapse_class: true } - else - %td.notes_content.parallel.old{ colspan: 2 } + %td.notes-content.parallel.old{ colspan: 2 } .content - if discussions_right - %td.notes_content.parallel.new{ colspan: 2 } + %td.notes-content.parallel.new{ colspan: 2 } .content{ class: ('hide' unless discussions_right.any?(&:expanded?)) } = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new', locals: { disable_collapse_class: true } - else - %td.notes_content.parallel.new{ colspan: 2 } + %td.notes-content.parallel.new{ colspan: 2 } .content |