aboutsummaryrefslogtreecommitdiff
path: root/src/components/emoji_input
diff options
context:
space:
mode:
authorShpuld Shpuldson <shp@cock.li>2020-10-29 08:55:54 +0200
committerShpuld Shpuldson <shp@cock.li>2020-10-29 08:55:54 +0200
commit6acb61f2968063f19445a99851a2c1dda6783ac8 (patch)
tree259501d7645fe1801f4615519dfd8e43b26eb531 /src/components/emoji_input
parent24d85ce6dc77c2e18759bdb67c8005fcd697a0c5 (diff)
parenta84db4bd8f04bdfc14836f55f441aa8478265291 (diff)
fix conflict, keep the touchable button big
Diffstat (limited to 'src/components/emoji_input')
-rw-r--r--src/components/emoji_input/emoji_input.js9
-rw-r--r--src/components/emoji_input/emoji_input.vue2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index f0123447..87303d08 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -3,6 +3,15 @@ import EmojiPicker from '../emoji_picker/emoji_picker.vue'
import { take } from 'lodash'
import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+ faSmileBeam
+} from '@fortawesome/free-regular-svg-icons'
+
+library.add(
+ faSmileBeam
+)
+
/**
* EmojiInput - augmented inputs for emoji and autocomplete support in inputs
* without having to give up the comfort of <input/> and <textarea/> elements
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index b9a74572..224e72cf 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -11,7 +11,7 @@
class="emoji-picker-icon"
@click.prevent="togglePicker"
>
- <i class="icon-smile" />
+ <FAIcon :icon="['far', 'smile-beam']" />
</div>
<EmojiPicker
v-if="enableEmojiPicker"