diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 09:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 09:09:17 +0000 |
| commit | 43c14d2d9245aea5964d52d3e4915be1126977cb (patch) | |
| tree | 769e314e13e40059f6b5ff228e670e278d201e06 /app/views/snippets | |
| parent | ecf2b5b6048d8f289d085b5d7951381c1ef4dca0 (diff) | |
| download | gitlab-ce-43c14d2d9245aea5964d52d3e4915be1126977cb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/snippets')
| -rw-r--r-- | app/views/snippets/notes/_actions.html.haml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/app/views/snippets/notes/_actions.html.haml b/app/views/snippets/notes/_actions.html.haml index 2e94bbe4baf..80d680d8b5a 100644 --- a/app/views/snippets/notes/_actions.html.haml +++ b/app/views/snippets/notes/_actions.html.haml @@ -1,15 +1,14 @@ - if current_user - if note.emoji_awardable? .note-actions-item - = link_to '#', title: _('Add reaction'), class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip", data: { position: 'right' } do - %span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile') - %span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley') - %span{ class: 'link-highlight award-control-icon-super-positive' }= sprite_icon('smile') + = link_to '#', title: _('Add reaction'), class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn gl-button btn-icon btn-default-tertiary", data: { position: 'right' } do + = sprite_icon('slight-smile', css_class: 'award-control-icon-neutral gl-button-icon gl-icon') + = sprite_icon('smiley', css_class: 'award-control-icon-positive gl-button-icon gl-icon gl-left-3!') + = sprite_icon('smile', css_class: 'award-control-icon-super-positive gl-button-icon gl-icon gl-left-3! ') - if note_editable - .note-actions-item - = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip gl-button btn btn-transparent', data: { container: 'body', qa_selector: 'edit_comment_button' } do - %span.link-highlight - = custom_icon('icon_pencil') + .note-actions-item.gl-ml-0 + = button_tag title: _('Edit comment'), class: 'note-action-button js-note-edit has-tooltip gl-button btn btn-default-tertiary btn-icon', data: { container: 'body', qa_selector: 'edit_comment_button' } do + = sprite_icon('pencil') = render 'projects/notes/more_actions_dropdown', note: note, note_editable: note_editable |