diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-31 13:39:34 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-31 13:39:34 +0000 |
| commit | 12aff0b73cacf533533d584d68307b1b6a030cee (patch) | |
| tree | 9a2a3f176296bd39ab801ecafeb6f90517cf1688 | |
| parent | 4e888212a1cdf5898c5cef69f5a2de909a275d31 (diff) | |
| parent | 7099211ea7eb409e7b13670a3ecaa8503f4714fc (diff) | |
| download | gitlab-ce-12aff0b73cacf533533d584d68307b1b6a030cee.tar.gz | |
Merge branch '60987-emoji-picker-popup' into 'master'
Fix emoji picker popup is not always fully visible
Closes #60987
See merge request gitlab-org/gitlab-ce!28984
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/60987-emoji-picker-popup.yml | 5 | ||||
| -rw-r--r-- | spec/javascripts/notes/components/note_actions_spec.js | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 78f397ccc12..c9c40cb6acf 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -147,6 +147,7 @@ export default { class="note-action-button note-emoji-button js-add-award js-note-emoji" href="#" title="Add reaction" + data-position="right" > <icon css-classes="link-highlight award-control-icon-neutral" name="slight-smile" /> <icon css-classes="link-highlight award-control-icon-positive" name="smiley" /> diff --git a/changelogs/unreleased/60987-emoji-picker-popup.yml b/changelogs/unreleased/60987-emoji-picker-popup.yml new file mode 100644 index 00000000000..3bccec8e164 --- /dev/null +++ b/changelogs/unreleased/60987-emoji-picker-popup.yml @@ -0,0 +1,5 @@ +--- +title: Fix emoji picker visibility issue +merge_request: 28984 +author: +type: fixed diff --git a/spec/javascripts/notes/components/note_actions_spec.js b/spec/javascripts/notes/components/note_actions_spec.js index 0cfcc994234..2159e4ddf16 100644 --- a/spec/javascripts/notes/components/note_actions_spec.js +++ b/spec/javascripts/notes/components/note_actions_spec.js @@ -58,6 +58,7 @@ describe('noteActions', () => { it('should render emoji link', () => { expect(wrapper.find('.js-add-award').exists()).toBe(true); + expect(wrapper.find('.js-add-award').attributes('data-position')).toBe('right'); }); describe('actions dropdown', () => { |