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/global_notice_list | |
| 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/global_notice_list')
| -rw-r--r-- | src/components/global_notice_list/global_notice_list.js | 8 | ||||
| -rw-r--r-- | src/components/global_notice_list/global_notice_list.vue | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/components/global_notice_list/global_notice_list.js b/src/components/global_notice_list/global_notice_list.js index 3af29c23..e93fba75 100644 --- a/src/components/global_notice_list/global_notice_list.js +++ b/src/components/global_notice_list/global_notice_list.js @@ -1,3 +1,11 @@ +import { library } from '@fortawesome/fontawesome-svg-core' +import { + faTimes +} from '@fortawesome/free-solid-svg-icons' + +library.add( + faTimes +) const GlobalNoticeList = { computed: { diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue index 0e4285cc..8a33b9eb 100644 --- a/src/components/global_notice_list/global_notice_list.vue +++ b/src/components/global_notice_list/global_notice_list.vue @@ -9,8 +9,9 @@ <div class="notice-message"> {{ $t(notice.messageKey, notice.messageArgs) }} </div> - <i - class="button-icon icon-cancel" + <FAIcon + class="fa-scale-110 fa-old-padding" + icon="times" @click="closeNotice(notice)" /> </div> |