Commit 2a888700 authored by Yogi's avatar Yogi Committed by Kushal Pandya

Move add reaction button of note to gl-button

parent 5492f611
...@@ -259,19 +259,28 @@ export default { ...@@ -259,19 +259,28 @@ export default {
class="line-resolve-btn note-action-button" class="line-resolve-btn note-action-button"
@click="onResolve" @click="onResolve"
/> />
<a <gl-button
v-if="canAwardEmoji" v-if="canAwardEmoji"
v-gl-tooltip v-gl-tooltip
:class="{ 'js-user-authored': isAuthoredByCurrentUser }" :class="{ 'js-user-authored': isAuthoredByCurrentUser }"
class="note-action-button note-emoji-button js-add-award js-note-emoji gl-text-gray-600 gl-m-2" class="note-action-button note-emoji-button add-reaction-button js-add-award js-note-emoji"
href="#" category="tertiary"
variant="default"
size="small"
title="Add reaction" title="Add reaction"
data-position="right" data-position="right"
:aria-label="__('Add reaction')"
> >
<gl-icon class="link-highlight award-control-icon-neutral" name="slight-smile" /> <span class="reaction-control-icon reaction-control-icon-neutral">
<gl-icon class="link-highlight award-control-icon-positive" name="smiley" /> <gl-icon name="slight-smile" />
<gl-icon class="link-highlight award-control-icon-super-positive" name="smile" /> </span>
</a> <span class="reaction-control-icon reaction-control-icon-positive">
<gl-icon name="smiley" />
</span>
<span class="reaction-control-icon reaction-control-icon-super-positive">
<gl-icon name="smile" />
</span>
</gl-button>
<reply-button <reply-button
v-if="showReply" v-if="showReply"
ref="replyButton" ref="replyButton"
......
---
title: Move add reaction button of note to gl-button
merge_request: 53565
author: Yogi (@yo)
type: other
...@@ -135,7 +135,7 @@ RSpec.describe 'User interacts with awards' do ...@@ -135,7 +135,7 @@ RSpec.describe 'User interacts with awards' do
it 'allows adding a new emoji' do it 'allows adding a new emoji' do
page.within('.note-actions') do page.within('.note-actions') do
find('a.js-add-award').click find('.btn.js-add-award').click
end end
page.within('.emoji-menu-content') do page.within('.emoji-menu-content') do
find('gl-emoji[data-name="8ball"]').click find('gl-emoji[data-name="8ball"]').click
...@@ -157,7 +157,7 @@ RSpec.describe 'User interacts with awards' do ...@@ -157,7 +157,7 @@ RSpec.describe 'User interacts with awards' do
end end
page.within('.note-actions') do page.within('.note-actions') do
expect(page).not_to have_css('a.js-add-award') expect(page).not_to have_css('.btn.js-add-award')
end end
end end
......
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