From d3baf624d110b86e07da538ca0f78948d978f5d5 Mon Sep 17 00:00:00 2001 From: AFR Date: Sat, 24 Feb 2018 05:47:51 +0700 Subject: [PATCH] Adapt to FontAwesome v5.0.6 icon name changes (#8) --- extensions/sticky/composer.json | 2 +- extensions/sticky/js/admin/src/main.js | 2 +- extensions/sticky/js/forum/src/addStickyBadge.js | 2 +- extensions/sticky/js/forum/src/addStickyControl.js | 2 +- .../sticky/js/forum/src/components/DiscussionStickiedPost.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/sticky/composer.json b/extensions/sticky/composer.json index 0bdb3b166..474e6140f 100644 --- a/extensions/sticky/composer.json +++ b/extensions/sticky/composer.json @@ -29,7 +29,7 @@ "flarum-extension": { "title": "Sticky", "icon": { - "name": "thumb-tack", + "name": "fa fa-thumbtack", "backgroundColor": "#D13E32", "color": "#fff" } diff --git a/extensions/sticky/js/admin/src/main.js b/extensions/sticky/js/admin/src/main.js index 08879f01f..ab0447aa1 100644 --- a/extensions/sticky/js/admin/src/main.js +++ b/extensions/sticky/js/admin/src/main.js @@ -5,7 +5,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid'; app.initializers.add('flarum-sticky', () => { extend(PermissionGrid.prototype, 'moderateItems', items => { items.add('sticky', { - icon: 'thumb-tack', + icon: 'fa fa-thumbtack', label: app.translator.trans('flarum-sticky.admin.permissions.sticky_discussions_label'), permission: 'discussion.sticky' }, 95); diff --git a/extensions/sticky/js/forum/src/addStickyBadge.js b/extensions/sticky/js/forum/src/addStickyBadge.js index 8d0d7ca2d..950d578fc 100644 --- a/extensions/sticky/js/forum/src/addStickyBadge.js +++ b/extensions/sticky/js/forum/src/addStickyBadge.js @@ -8,7 +8,7 @@ export default function addStickyBadge() { badges.add('sticky', Badge.component({ type: 'sticky', label: app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip'), - icon: 'thumb-tack' + icon: 'fa fa-thumbtack' }), 10); } }); diff --git a/extensions/sticky/js/forum/src/addStickyControl.js b/extensions/sticky/js/forum/src/addStickyControl.js index c08aff5e9..94624e99d 100644 --- a/extensions/sticky/js/forum/src/addStickyControl.js +++ b/extensions/sticky/js/forum/src/addStickyControl.js @@ -8,7 +8,7 @@ export default function addStickyControl() { if (discussion.canSticky()) { items.add('sticky', Button.component({ children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'), - icon: 'thumb-tack', + icon: 'fa fa-thumbtack', onclick: this.stickyAction.bind(discussion) })); } diff --git a/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js b/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js index bd207c035..353b78280 100644 --- a/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js +++ b/extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js @@ -2,7 +2,7 @@ import EventPost from 'flarum/components/EventPost'; export default class DiscussionStickiedPost extends EventPost { icon() { - return 'thumb-tack'; + return 'fa fa-thumbtack'; } descriptionKey() {