github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-20 15:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from afrastgeek/master

Browse Source 
Change fa icon prefix to fas
This commit is contained in:
Franz Liedke 2018-05-10 21:21:32 +02:00 committed by GitHub
commit 8862f5ccee
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/subscriptions/composer.json
View File

@ -29,7 +29,7 @@
"flarum-extension": {
"title": "Subscriptions",
"icon": {
"name": "fa fa-star",
"name": "fas fa-star",
"backgroundColor": "#ffea7b",
"color": "#de8e00"
}

2
extensions/subscriptions/js/forum/src/addSubscriptionBadge.js
View File

@ -10,7 +10,7 @@ export default function addSubscriptionBadge() {
case 'follow':
badge = Badge.component({
label: app.translator.trans('flarum-subscriptions.forum.badge.following_tooltip'),
icon: 'fa fa-star',
icon: 'fas fa-star',
type: 'following'
});
break;

4
extensions/subscriptions/js/forum/src/addSubscriptionControls.js
View File

@ -9,9 +9,9 @@ export default function addSubscriptionControls() {
extend(DiscussionControls, 'userControls', function(items, discussion, context) {
if (app.session.user && !(context instanceof DiscussionPage)) {
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},
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';

2
extensions/subscriptions/js/forum/src/addSubscriptionFilter.js
View File

@ -13,7 +13,7 @@ export default function addSubscriptionFilter() {
items.add('following', LinkButton.component({
href: app.route('index.filter', params),
children: app.translator.trans('flarum-subscriptions.forum.index.following_link'),
icon: 'fa fa-star'
icon: 'fas fa-star'
}), 50);
}
});

2
extensions/subscriptions/js/forum/src/components/NewPostNotification.js
View File

@ -3,7 +3,7 @@ import username from 'flarum/helpers/username';
export default class NewPostNotification extends Notification {
icon() {
return 'fa fa-star';
return 'fas fa-star';
}
href() {

6
extensions/subscriptions/js/forum/src/components/SubscriptionMenu.js
View File

@ -16,7 +16,7 @@ export default class SubscriptionMenu extends Dropdown {
},
{
subscription: 'follow',
icon: 'fa fa-star',
icon: 'fas fa-star',
label: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button'),
description: app.translator.trans('flarum-subscriptions.forum.sub_controls.following_text')
},
@ -40,7 +40,7 @@ export default class SubscriptionMenu extends Dropdown {
switch (subscription) {
case 'follow':
buttonLabel = app.translator.trans('flarum-subscriptions.forum.sub_controls.following_button');
buttonIcon = 'fa fa-star';
buttonIcon = 'fas fa-star';
break;
case 'ignore':
@ -85,7 +85,7 @@ export default class SubscriptionMenu extends Dropdown {
{Button.component(buttonProps)}
<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>
<ul className="Dropdown-menu dropdown-menu Dropdown-menu--right">

2
extensions/subscriptions/js/forum/src/components/SubscriptionMenuItem.js
View File

@ -5,7 +5,7 @@ export default class SubscriptionMenuItem extends Component {
view() {
return (
<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">
{icon(this.props.icon, {className: 'Button-icon'})}
<strong>{this.props.label}</strong>

2
extensions/subscriptions/js/forum/src/main.js
View File

@ -24,7 +24,7 @@ app.initializers.add('subscriptions', function() {
extend(NotificationGrid.prototype, 'notificationTypes', function(items) {
items.add('newPost', {
name: 'newPost',
icon: 'fa fa-star',
icon: 'fas fa-star',
label: app.translator.trans('flarum-subscriptions.forum.settings.notify_new_post_label')
});
});