diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
| commit | cb3578fcca763a43ec946af75e6e345ed5adc14a (patch) | |
| tree | 85fdd3f8bf98eae557d33ca1a82e3688e4e7f309 /src/components/emoji_input | |
| parent | 7007659e05842dc06eb2c13eddaba6ab657df5ea (diff) | |
| parent | a84db4bd8f04bdfc14836f55f441aa8478265291 (diff) | |
fix conflicts
Diffstat (limited to 'src/components/emoji_input')
| -rw-r--r-- | src/components/emoji_input/emoji_input.js | 9 | ||||
| -rw-r--r-- | src/components/emoji_input/emoji_input.vue | 2 |
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" |