diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-18 15:10:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-18 15:10:09 +0300 |
| commit | 4c3f961bd94656e64cee5b0ad07b3f49a84338a5 (patch) | |
| tree | eb9afef2d82734c64869ab4a78b99ea6d1805501 /app/assets/javascripts/emoji | |
| parent | 16887b928c9b4f26aabdb2f37ec5fe4ee97e73fe (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji')
| -rw-r--r-- | app/assets/javascripts/emoji/components/picker.vue | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue index b6e86cc2a60..0e3dd9f7535 100644 --- a/app/assets/javascripts/emoji/components/picker.vue +++ b/app/assets/javascripts/emoji/components/picker.vue @@ -107,7 +107,17 @@ export default { @hidden="$emit('hidden')" > <template #button-content> - <slot name="button-content"></slot> + <slot name="button-content"> + <gl-icon class="award-control-icon-neutral gl-button-icon gl-icon" name="slight-smile" /> + <gl-icon + class="award-control-icon-positive gl-button-icon gl-icon gl-left-3!" + name="smiley" + /> + <gl-icon + class="award-control-icon-super-positive gl-button-icon gl-icon gl-left-3!" + name="smile" + /> + </slot> <span class="gl-sr-only">{{ __('Add reaction') }}</span> </template> <gl-search-box-by-type |