Merge pull request #49 from afrastgeek/master

Change fa icon prefix to fas

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"
             }

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);

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);

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')
     }));

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,

extensions/tags/js/admin/src/components/TagsPage.js

@@ -14,7 +14,7 @@ function tagItem(tag) {
         <span className="TagListItem-name">{tag.name()}</span>
         {Button.component({
           className: 'Button Button--link',
-          icon: 'fa fa-pencil-alt',
+          icon: 'fas fa-pencil-alt',
           onclick: () => app.modal.show(new EditTagModal({tag}))
         })}
       </div>
@@ -40,7 +40,7 @@ export default class TagsPage extends Page {
             </p>
             {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())
             })}

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}))
       }));
     }

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);

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() {

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')
             })}
           </div>

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();
   }