diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-10-28 21:21:35 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-10-28 21:21:35 +0000 |
| commit | a84db4bd8f04bdfc14836f55f441aa8478265291 (patch) | |
| tree | c5e08f042c0cbab4cc212e35c624d5afa65b85bc /src/components/emoji_picker/emoji_picker.vue | |
| parent | e2c4816feb700d25bbeaebee6c5a67ae5f478e90 (diff) | |
| parent | ef36ca44f613c3d7d2ea11a9ad4f7fe828f7ae83 (diff) | |
Merge branch 'fontawesome5' into 'develop'
FontAwesome 5
Closes #982
See merge request pleroma/pleroma-fe!1260
Diffstat (limited to 'src/components/emoji_picker/emoji_picker.vue')
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index 191b9fa1..3262a3d9 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -13,7 +13,10 @@ :title="group.text" @click.prevent="highlight(group.id)" > - <i :class="group.icon" /> + <FAIcon + :icon="group.icon" + fixed-width + /> </span> </span> <span @@ -26,7 +29,10 @@ :title="$t('emoji.stickers')" @click.prevent="toggleStickers" > - <i class="icon-star" /> + <FAIcon + icon="sticky-note" + fixed-width + /> </span> </span> </div> |