mirror of
https://github.com/flarum/core.git
synced 2025-08-09 01:46:35 +02:00
Change fa icon prefix to fas
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
"flarum-extension": {
|
"flarum-extension": {
|
||||||
"title": "Subscriptions",
|
"title": "Subscriptions",
|
||||||
"icon": {
|
"icon": {
|
||||||
"name": "fa fa-star",
|
"name": "fas fa-star",
|
||||||
"backgroundColor": "#ffea7b",
|
"backgroundColor": "#ffea7b",
|
||||||
"color": "#de8e00"
|
"color": "#de8e00"
|
||||||
}
|
}
|
||||||
|
@@ -10,7 +10,7 @@ export default function addSubscriptionBadge() {
|
|||||||
case 'follow':
|
case 'follow':
|
||||||
badge = Badge.component({
|
badge = Badge.component({
|
||||||
label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
|
label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
|
||||||
icon: 'fa fa-star',
|
icon: 'fas fa-star',
|
||||||
type: 'following'
|
type: 'following'
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
@@ -9,9 +9,9 @@ export default function addSubscriptionControls() {
|
|||||||
extend(DiscussionControls, 'userControls', function(items, discussion, context) {
|
extend(DiscussionControls, 'userControls', function(items, discussion, context) {
|
||||||
if (app.session.user && !(context instanceof DiscussionPage)) {
|
if (app.session.user && !(context instanceof DiscussionPage)) {
|
||||||
const states = {
|
const states = {
|
||||||
none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'fa fa-star', save: 'follow'},
|
none: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.follow_button'), icon: 'fas fa-star', save: 'follow'},
|
||||||
follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'far fa-star', save: false},
|
follow: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unfollow_button'), icon: 'far fa-star', save: false},
|
||||||
ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'fa fa-eye', save: false}
|
ignore: {label: app.translator.trans('flarum-subscriptions.forum.discussion_controls.unignore_button'), icon: 'fas fa-eye', save: false}
|
||||||
};
|
};
|
||||||
|
|
||||||
const subscription = discussion.subscription() || 'none';
|
const subscription = discussion.subscription() || 'none';
|
||||||
|
@@ -13,7 +13,7 @@ export default function addSubscriptionFilter() {
|
|||||||
items.add('following', LinkButton.component({
|
items.add('following', LinkButton.component({
|
||||||
href: app.route('index.filter', params),
|
href: app.route('index.filter', params),
|
||||||
children: app.translator.trans('flarum-subscriptions.forum.index.following_link'),
|
children: app.translator.trans('flarum-subscriptions.forum.index.following_link'),
|
||||||
icon: 'fa fa-star'
|
icon: 'fas fa-star'
|
||||||
}), 50);
|
}), 50);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@@ -3,7 +3,7 @@ import username from 'flarum/helpers/username';
|
|||||||
|
|
||||||
export default class NewPostNotification extends Notification {
|
export default class NewPostNotification extends Notification {
|
||||||
icon() {
|
icon() {
|
||||||
return 'fa fa-star';
|
return 'fas fa-star';
|
||||||
}
|
}
|
||||||
|
|
||||||
href() {
|
href() {
|
||||||
|
@@ -16,7 +16,7 @@ export default class SubscriptionMenu extends Dropdown {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
subscription: 'follow',
|
subscription: 'follow',
|
||||||
icon: 'fa fa-star',
|
icon: 'fas fa-star',
|
||||||
label: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button'),
|
label: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button'),
|
||||||
description: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_text')
|
description: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_text')
|
||||||
},
|
},
|
||||||
@@ -40,7 +40,7 @@ export default class SubscriptionMenu extends Dropdown {
|
|||||||
switch (subscription) {
|
switch (subscription) {
|
||||||
case 'follow':
|
case 'follow':
|
||||||
buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button');
|
buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button');
|
||||||
buttonIcon = 'fa fa-star';
|
buttonIcon = 'fas fa-star';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'ignore':
|
case 'ignore':
|
||||||
@@ -85,7 +85,7 @@ export default class SubscriptionMenu extends Dropdown {
|
|||||||
{Button.component(buttonProps)}
|
{Button.component(buttonProps)}
|
||||||
|
|
||||||
<button className={'Dropdown-toggle Button Button--icon ' + buttonClass} data-toggle="dropdown">
|
<button className={'Dropdown-toggle Button Button--icon ' + buttonClass} data-toggle="dropdown">
|
||||||
{icon('fa fa-caret-down', {className: 'Button-icon'})}
|
{icon('fas fa-caret-down', {className: 'Button-icon'})}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<ul className="Dropdown-menu dropdown-menu Dropdown-menu--right">
|
<ul className="Dropdown-menu dropdown-menu Dropdown-menu--right">
|
||||||
|
@@ -5,7 +5,7 @@ export default class SubscriptionMenuItem extends Component {
|
|||||||
view() {
|
view() {
|
||||||
return (
|
return (
|
||||||
<button className="SubscriptionMenuItem hasIcon" onclick={this.props.onclick}>
|
<button className="SubscriptionMenuItem hasIcon" onclick={this.props.onclick}>
|
||||||
{this.props.active ? icon('fa fa-check', {className: 'Button-icon'}) : ''}
|
{this.props.active ? icon('fas fa-check', {className: 'Button-icon'}) : ''}
|
||||||
<span className="SubscriptionMenuItem-label">
|
<span className="SubscriptionMenuItem-label">
|
||||||
{icon(this.props.icon, {className: 'Button-icon'})}
|
{icon(this.props.icon, {className: 'Button-icon'})}
|
||||||
<strong>{this.props.label}</strong>
|
<strong>{this.props.label}</strong>
|
||||||
|
@@ -24,7 +24,7 @@ app.initializers.add('subscriptions', function() {
|
|||||||
extend(NotificationGrid.prototype, 'notificationTypes', function(items) {
|
extend(NotificationGrid.prototype, 'notificationTypes', function(items) {
|
||||||
items.add('newPost', {
|
items.add('newPost', {
|
||||||
name: 'newPost',
|
name: 'newPost',
|
||||||
icon: 'fa fa-star',
|
icon: 'fas fa-star',
|
||||||
label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label')
|
label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label')
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Reference in New Issue
Block a user