From 21443d95b452fef1a078be13319d788600d93568 Mon Sep 17 00:00:00 2001 From: Ammar Fadhlur Rahman Date: Thu, 10 May 2018 15:06:30 +0700 Subject: [PATCH] Change fa icon prefix to fas --- extensions/tags/composer.json | 2 +- extensions/tags/js/admin/src/addTagChangePermission.js | 2 +- extensions/tags/js/admin/src/addTagPermission.js | 2 +- extensions/tags/js/admin/src/addTagsPane.js | 2 +- extensions/tags/js/admin/src/addTagsPermissionScope.js | 2 +- extensions/tags/js/admin/src/components/TagsPage.js | 4 ++-- extensions/tags/js/forum/src/addTagControl.js | 2 +- extensions/tags/js/forum/src/addTagList.js | 2 +- .../tags/js/forum/src/components/DiscussionTaggedPost.js | 2 +- extensions/tags/js/forum/src/components/TagDiscussionModal.js | 2 +- extensions/tags/js/forum/src/components/TagsPage.js | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extensions/tags/composer.json b/extensions/tags/composer.json index 7b0e14988..c7fe0bdf8 100644 --- a/extensions/tags/composer.json +++ b/extensions/tags/composer.json @@ -29,7 +29,7 @@ "flarum-extension": { "title": "Tags", "icon": { - "name": "fa fa-tags", + "name": "fas fa-tags", "backgroundColor": "#F28326", "color": "#fff" } diff --git a/extensions/tags/js/admin/src/addTagChangePermission.js b/extensions/tags/js/admin/src/addTagChangePermission.js index 88a0536cf..32803d681 100644 --- a/extensions/tags/js/admin/src/addTagChangePermission.js +++ b/extensions/tags/js/admin/src/addTagChangePermission.js @@ -5,7 +5,7 @@ import SettingDropdown from 'flarum/components/SettingDropdown'; export default function() { extend(PermissionGrid.prototype, 'startItems', items => { items.add('allowTagChange', { - icon: 'fa fa-tag', + icon: 'fas fa-tag', label: app.translator.trans('flarum-tags.admin.permissions.allow_edit_tags_label'), setting: () => { const minutes = parseInt(app.data.settings.allow_tag_change, 10); diff --git a/extensions/tags/js/admin/src/addTagPermission.js b/extensions/tags/js/admin/src/addTagPermission.js index c88fa837a..9278ec133 100644 --- a/extensions/tags/js/admin/src/addTagPermission.js +++ b/extensions/tags/js/admin/src/addTagPermission.js @@ -4,7 +4,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid'; export default function() { extend(PermissionGrid.prototype, 'moderateItems', items => { items.add('tag', { - icon: 'fa fa-tag', + icon: 'fas fa-tag', label: app.translator.trans('flarum-tags.admin.permissions.tag_discussions_label'), permission: 'discussion.tag' }, 95); diff --git a/extensions/tags/js/admin/src/addTagsPane.js b/extensions/tags/js/admin/src/addTagsPane.js index 68f55a0ba..ebafbee35 100644 --- a/extensions/tags/js/admin/src/addTagsPane.js +++ b/extensions/tags/js/admin/src/addTagsPane.js @@ -12,7 +12,7 @@ export default function() { extend(AdminNav.prototype, 'items', items => { items.add('tags', AdminLinkButton.component({ href: app.route('tags'), - icon: 'fa fa-tags', + icon: 'fas fa-tags', children: app.translator.trans('flarum-tags.admin.nav.tags_button'), description: app.translator.trans('flarum-tags.admin.nav.tags_text') })); diff --git a/extensions/tags/js/admin/src/addTagsPermissionScope.js b/extensions/tags/js/admin/src/addTagsPermissionScope.js index e2b2e7cad..f062c8c9a 100644 --- a/extensions/tags/js/admin/src/addTagsPermissionScope.js +++ b/extensions/tags/js/admin/src/addTagsPermissionScope.js @@ -52,7 +52,7 @@ export default function() { className: 'Dropdown--restrictByTag', buttonClassName: 'Button Button--text', label: app.translator.trans('flarum-tags.admin.permissions.restrict_by_tag_heading'), - icon: 'fa fa-plus', + icon: 'fas fa-plus', caretIcon: null, children: tags.map(tag => Button.component({ icon: true, diff --git a/extensions/tags/js/admin/src/components/TagsPage.js b/extensions/tags/js/admin/src/components/TagsPage.js index 739d83c3b..5e1316594 100644 --- a/extensions/tags/js/admin/src/components/TagsPage.js +++ b/extensions/tags/js/admin/src/components/TagsPage.js @@ -14,7 +14,7 @@ function tagItem(tag) { {tag.name()} {Button.component({ className: 'Button Button--link', - icon: 'fa fa-pencil-alt', + icon: 'fas fa-pencil-alt', onclick: () => app.modal.show(new EditTagModal({tag})) })} @@ -40,7 +40,7 @@ export default class TagsPage extends Page {

{Button.component({ className: 'Button Button--primary', - icon: 'fa fa-plus', + icon: 'fas fa-plus', children: app.translator.trans('flarum-tags.admin.tags.create_tag_button'), onclick: () => app.modal.show(new EditTagModal()) })} diff --git a/extensions/tags/js/forum/src/addTagControl.js b/extensions/tags/js/forum/src/addTagControl.js index 80e7ce900..0ff307200 100644 --- a/extensions/tags/js/forum/src/addTagControl.js +++ b/extensions/tags/js/forum/src/addTagControl.js @@ -10,7 +10,7 @@ export default function() { if (discussion.canTag()) { items.add('tags', Button.component({ children: app.translator.trans('flarum-tags.forum.discussion_controls.edit_tags_button'), - icon: 'fa fa-tag', + icon: 'fas fa-tag', onclick: () => app.modal.show(new TagDiscussionModal({discussion})) })); } diff --git a/extensions/tags/js/forum/src/addTagList.js b/extensions/tags/js/forum/src/addTagList.js index 8f2e2b97d..2951aa128 100644 --- a/extensions/tags/js/forum/src/addTagList.js +++ b/extensions/tags/js/forum/src/addTagList.js @@ -12,7 +12,7 @@ export default function() { // to the index page's sidebar. extend(IndexPage.prototype, 'navItems', function(items) { items.add('tags', LinkButton.component({ - icon: 'fa fa-th-large', + icon: 'fas fa-th-large', children: app.translator.trans('flarum-tags.forum.index.tags_link'), href: app.route('tags') }), -10); diff --git a/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js b/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js index a858b8515..9749cdade 100644 --- a/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js +++ b/extensions/tags/js/forum/src/components/DiscussionTaggedPost.js @@ -19,7 +19,7 @@ export default class DiscussionTaggedPost extends EventPost { } icon() { - return 'fa fa-tag'; + return 'fas fa-tag'; } descriptionKey() { diff --git a/extensions/tags/js/forum/src/components/TagDiscussionModal.js b/extensions/tags/js/forum/src/components/TagDiscussionModal.js index 8ff4fe9f8..dca22d2ac 100644 --- a/extensions/tags/js/forum/src/components/TagDiscussionModal.js +++ b/extensions/tags/js/forum/src/components/TagDiscussionModal.js @@ -177,7 +177,7 @@ export default class TagDiscussionModal extends Modal { type: 'submit', className: 'Button Button--primary', disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary, - icon: 'fa fa-check', + icon: 'fas fa-check', children: app.translator.trans('flarum-tags.forum.choose_tags.submit_button') })} diff --git a/extensions/tags/js/forum/src/components/TagsPage.js b/extensions/tags/js/forum/src/components/TagsPage.js index 5ccb68fe6..1305ba767 100644 --- a/extensions/tags/js/forum/src/components/TagsPage.js +++ b/extensions/tags/js/forum/src/components/TagsPage.js @@ -12,7 +12,7 @@ export default class TagsPage extends Component { this.tags = sortTags(app.store.all('tags').filter(tag => !tag.parent())); app.current = this; - app.history.push('tags', icon('fa fa-th-large')); + app.history.push('tags', icon('fas fa-th-large')); app.drawer.hide(); app.modal.close(); }