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/react_button | |
| parent | 7007659e05842dc06eb2c13eddaba6ab657df5ea (diff) | |
| parent | a84db4bd8f04bdfc14836f55f441aa8478265291 (diff) | |
fix conflicts
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 4 | ||||
| -rw-r--r-- | src/components/react_button/react_button.vue | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index dd71e546..de0df70c 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -1,4 +1,8 @@ import Popover from '../popover/popover.vue' +import { library } from '@fortawesome/fontawesome-svg-core' +import { faSmileBeam } from '@fortawesome/free-regular-svg-icons' + +library.add(faSmileBeam) const ReactButton = { props: ['status'], diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index 0b34add1..694e6470 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -36,9 +36,10 @@ <div class="reaction-bottom-fader" /> </div> </div> - <i + <FAIcon slot="trigger" - class="icon-smile button-icon add-reaction-button" + class="fa-scale-110 fa-old-padding add-reaction-button" + :icon="['far', 'smile-beam']" :title="$t('tool_tip.add_reaction')" /> </Popover> |
