From c5818ba87de62c2f0bd3be7574dc366b6093ba61 Mon Sep 17 00:00:00 2001 From: AFR Date: Sat, 24 Feb 2018 05:43:43 +0700 Subject: [PATCH] Adapt to FontAwesome v5.0.6 icon name changes (#30) --- extensions/mentions/composer.json | 2 +- extensions/mentions/js/forum/src/addMentionedByList.js | 2 +- .../js/forum/src/components/PostMentionedNotification.js | 2 +- .../mentions/js/forum/src/components/PostQuoteButton.js | 2 +- .../js/forum/src/components/UserMentionedNotification.js | 2 +- extensions/mentions/js/forum/src/main.js | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/mentions/composer.json b/extensions/mentions/composer.json index 456aca814..a7d35c19f 100644 --- a/extensions/mentions/composer.json +++ b/extensions/mentions/composer.json @@ -29,7 +29,7 @@ "flarum-extension": { "title": "Mentions", "icon": { - "name": "at", + "name": "fa fa-at", "backgroundColor": "#539EC1", "color": "#fff" } diff --git a/extensions/mentions/js/forum/src/addMentionedByList.js b/extensions/mentions/js/forum/src/addMentionedByList.js index 797ff4b34..8768438b9 100644 --- a/extensions/mentions/js/forum/src/addMentionedByList.js +++ b/extensions/mentions/js/forum/src/addMentionedByList.js @@ -115,7 +115,7 @@ export default function addMentionedByList() { items.add('replies',
- {icon('reply')} + {icon('fa fa-reply')} {app.translator.transChoice('flarum-mentions.forum.post.mentioned_by' + (repliers[0].user() === app.session.user ? '_self' : '') + '_text', names.length, { count: names.length, users: punctuateSeries(names) diff --git a/extensions/mentions/js/forum/src/components/PostMentionedNotification.js b/extensions/mentions/js/forum/src/components/PostMentionedNotification.js index d18c8f333..fd27f30de 100644 --- a/extensions/mentions/js/forum/src/components/PostMentionedNotification.js +++ b/extensions/mentions/js/forum/src/components/PostMentionedNotification.js @@ -4,7 +4,7 @@ import punctuateSeries from 'flarum/helpers/punctuateSeries'; export default class PostMentionedNotification extends Notification { icon() { - return 'reply'; + return 'fa fa-reply'; } href() { diff --git a/extensions/mentions/js/forum/src/components/PostQuoteButton.js b/extensions/mentions/js/forum/src/components/PostQuoteButton.js index cbd60d786..0eb67bc68 100644 --- a/extensions/mentions/js/forum/src/components/PostQuoteButton.js +++ b/extensions/mentions/js/forum/src/components/PostQuoteButton.js @@ -9,7 +9,7 @@ export default class PostQuoteButton extends Button { const content = extract(this.props, 'content'); this.props.className = 'Button PostQuoteButton'; - this.props.icon = 'quote-left'; + this.props.icon = 'fa fa-quote-left'; this.props.children = app.translator.trans('flarum-mentions.forum.post.quote_button'); this.props.onclick = () => { this.hide(); diff --git a/extensions/mentions/js/forum/src/components/UserMentionedNotification.js b/extensions/mentions/js/forum/src/components/UserMentionedNotification.js index 831ff70d3..b768c48f8 100644 --- a/extensions/mentions/js/forum/src/components/UserMentionedNotification.js +++ b/extensions/mentions/js/forum/src/components/UserMentionedNotification.js @@ -2,7 +2,7 @@ import Notification from 'flarum/components/Notification'; export default class UserMentionedNotification extends Notification { icon() { - return 'at'; + return 'fa fa-at'; } href() { diff --git a/extensions/mentions/js/forum/src/main.js b/extensions/mentions/js/forum/src/main.js index 181375bf1..3867b732c 100644 --- a/extensions/mentions/js/forum/src/main.js +++ b/extensions/mentions/js/forum/src/main.js @@ -41,13 +41,13 @@ app.initializers.add('flarum-mentions', function() { extend(NotificationGrid.prototype, 'notificationTypes', function(items) { items.add('postMentioned', { name: 'postMentioned', - icon: 'reply', + icon: 'fa fa-reply', label: app.translator.trans('flarum-mentions.forum.settings.notify_post_mentioned_label') }); items.add('userMentioned', { name: 'userMentioned', - icon: 'at', + icon: 'fa fa-at', label: app.translator.trans('flarum-mentions.forum.settings.notify_user_mentioned_label') }); }); @@ -61,7 +61,7 @@ app.initializers.add('flarum-mentions', function() { href: app.route('user.mentions', {username: user.username()}), name: 'mentions', children: [app.translator.trans('flarum-mentions.forum.user.mentions_link')], - icon: 'at' + icon: 'fa fa-at' }), 80 );