Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 12:10:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-19 12:10:19 +0300
commit389312d00908adf98b30daac746805ec8447f92b (patch)
tree22409e071143486cd7d72eeefd115ce634f43c84 /app/assets/javascripts/emoji
parente173c316de15057b099a93053c9ef16180d6d1de (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.vue6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue
index e08d294b8c5..35f0a1a3818 100644
--- a/app/assets/javascripts/emoji/components/picker.vue
+++ b/app/assets/javascripts/emoji/components/picker.vue
@@ -23,6 +23,11 @@ export default {
required: false,
default: () => [],
},
+ dropdownClass: {
+ type: [Array, String, Object],
+ required: false,
+ default: () => [],
+ },
},
data() {
return {
@@ -78,6 +83,7 @@ export default {
ref="dropdown"
:toggle-class="toggleClass"
:boundary="getBoundaryElement()"
+ :class="dropdownClass"
menu-class="dropdown-extended-height"
category="tertiary"
no-flip