diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 15:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 15:09:30 +0300 |
| commit | 0549ffef0d4f862a7354847dd185725cc196eed0 (patch) | |
| tree | ab738498979b577ad3c89a986c6690250bcff104 /app/assets/javascripts/emoji | |
| parent | 03409cccee9b1cd8104484077338790add355c7d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji')
| -rw-r--r-- | app/assets/javascripts/emoji/components/category.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/emoji/components/picker.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/emoji/components/category.vue b/app/assets/javascripts/emoji/components/category.vue index db6ead3ff69..39881979c4f 100644 --- a/app/assets/javascripts/emoji/components/category.vue +++ b/app/assets/javascripts/emoji/components/category.vue @@ -39,7 +39,7 @@ export default { <template> <gl-intersection-observer class="gl-px-5 gl-h-full" @appear="categoryAppeared"> - <div class="gl-top-0 gl-py-3 gl-w-full emoji-picker-category-header"> + <div class="gl-top-0 gl-py-3 gl-w-full gl-z-index-1 emoji-picker-category-header"> <b>{{ categoryTitle }}</b> </div> <template v-if="emojis.length"> diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue index cbcc5dcff3a..71cabe80529 100644 --- a/app/assets/javascripts/emoji/components/picker.vue +++ b/app/assets/javascripts/emoji/components/picker.vue @@ -101,7 +101,7 @@ export default { v-for="(category, index) in categoryNames" :key="category.name" :class="{ - 'gl-text-black-normal! emoji-picker-category-active': index === currentCategory, + 'gl-text-body! emoji-picker-category-active': index === currentCategory, }" type="button" class="gl-border-0 gl-border-b-2 gl-border-b-solid gl-flex-fill-1 gl-text-gray-300 gl-pt-3 gl-pb-3 gl-bg-transparent emoji-picker-category-tab" |