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/react_button | |
| 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/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> |