diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 15:18:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 15:18:57 +0300 |
commit | 584ccdaf68710dec2c717a010cbab2610c0155ed (patch) | |
tree | 188e1f5609f5990ae3c3904d3752cf9603157596 /app/views/discussions | |
parent | ffe7c069a4e16f77b80c7159690a4c8060dd74d9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/discussions')
-rw-r--r-- | app/views/discussions/_notes.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index beac4946fd7..a35ba12dd52 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -9,9 +9,9 @@ -# to the first note position when we click on a badge diff discussion %ul.notes{ id: "discussion_#{discussion.id}", data: { discussion_id: discussion.id, position: discussion.notes[0].position.to_json } } - if discussion.try(:on_image?) && show_toggle - %button.gl-button.diff-notes-collapse.js-diff-notes-toggle{ type: 'button' } + %button.comment-indicator.gl-display-flex.gl-align-items-center.gl-justify-content-center.gl-font-sm.diff-notes-collapse.js-diff-notes-toggle{ type: 'button' } = sprite_icon('collapse', css_class: 'collapse-icon') - %button.gl-button.btn-transparent.badge.badge-pill.js-diff-notes-toggle{ type: 'button' } + %button.gl-align-items-center.gl-justify-content-center.gl-font-sm.small.gl-translate-x-n50.design-note-pin.js-diff-notes-toggle.diff-notes-expand{ type: 'button' } = badge_counter = render partial: "shared/notes/note", collection: discussion.notes, as: :note, locals: { badge_counter: badge_counter, show_image_comment_badge: show_image_comment_badge } |