diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
| commit | 51709ad31893714d98bf7c05cd37d1d07fde65ca (patch) | |
| tree | ace81acf8842a4063e12ae561f1a1a7de6aab2c6 /src/components/emoji_picker/emoji_picker.vue | |
| parent | 4de9daa1144536f03c86d277b4ec1288dc9df432 (diff) | |
| parent | 3056017f8e35c98a7fb42162c7e3460a4ebab619 (diff) | |
Merge branch 'develop' into 'scrobbles-age'
# Conflicts:
# src/i18n/en.json
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.vue')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index 1231ce2b..7c36deaa 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -23,9 +23,9 @@ v-for="group in filteredEmojiGroups" :ref="setGroupRef('group-header-' + group.id)" :key="group.id" - class="emoji-tabs-item" + class="button-unstyled emoji-tabs-item" :class="{ - active: activeGroupView === group.id + toggled: activeGroupView === group.id }" :title="group.text" role="button" @@ -52,8 +52,8 @@ class="additional-tabs" > <span - class="stickers-tab-icon additional-tabs-item" - :class="{active: showingStickers}" + class="button-unstyled stickers-tab-icon additional-tabs-item" + :class="{toggled: showingStickers}" :title="$t('emoji.stickers')" @click.prevent="toggleStickers" > @@ -77,7 +77,7 @@ ref="search" v-model="keyword" type="text" - class="form-control" + class="input form-control" :placeholder="$t('emoji.search_emoji')" @input="$event.target.composing = false" > |