diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 21:10:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-02 21:10:01 +0300 |
| commit | e84a2fdfc862ac63fe4be9df2f940c22a0c9aba3 (patch) | |
| tree | 8a64589231ede24f385d2819b3440fca001e482d /app/assets/javascripts/emoji | |
| parent | 1c2ff01b694fd06be15bc20279eef71ee5adf402 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji')
| -rw-r--r-- | app/assets/javascripts/emoji/awards_app/index.js | 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/awards_app/index.js b/app/assets/javascripts/emoji/awards_app/index.js index 16268910f49..1a084d37762 100644 --- a/app/assets/javascripts/emoji/awards_app/index.js +++ b/app/assets/javascripts/emoji/awards_app/index.js @@ -32,7 +32,7 @@ export default (el) => { canAwardEmoji: this.canAwardEmoji, currentUserId: this.currentUserId, defaultAwards: ['thumbsup', 'thumbsdown'], - selectedClass: 'gl-bg-blue-50! is-active', + selectedClass: 'selected', }, on: { award: this.toggleAward, diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue index 35f0a1a3818..78ba2aabcf8 100644 --- a/app/assets/javascripts/emoji/components/picker.vue +++ b/app/assets/javascripts/emoji/components/picker.vue @@ -85,7 +85,7 @@ export default { :boundary="getBoundaryElement()" :class="dropdownClass" menu-class="dropdown-extended-height" - category="tertiary" + category="secondary" no-flip right lazy |