github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-24 01:38:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from afrastgeek/master

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

2
extensions/flags/composer.json
View File

@ -29,7 +29,7 @@
"flarum-extension": {
"title": "Flags",
"icon": {
"name": "fa fa-flag",
"name": "fas fa-flag",
"backgroundColor": "#D659B5",
"color": "#fff"
}

4
extensions/flags/js/admin/src/main.js
View File

@ -9,7 +9,7 @@ app.initializers.add('flarum-flags', () => {
extend(PermissionGrid.prototype, 'moderateItems', items => {
items.add('viewFlags', {
icon: 'fa fa-flag',
icon: 'fas fa-flag',
label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
permission: 'discussion.viewFlags'
}, 65);
@ -17,7 +17,7 @@ app.initializers.add('flarum-flags', () => {
extend(PermissionGrid.prototype, 'replyItems', items => {
items.add('flagPosts', {
icon: 'fa fa-flag',
icon: 'fas fa-flag',
label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
permission: 'discussion.flagPosts'
}, 70);

2
extensions/flags/js/forum/src/addFlagControl.js
View File

@ -10,7 +10,7 @@ export default function() {
if (post.isHidden() || post.contentType() !== 'comment' || !post.canFlag() || post.user() === app.session.user) return;
items.add('flag',
<Button icon="fa fa-flag" onclick={() => app.modal.show(new FlagPostModal({post}))}>{app.translator.trans('flarum-flags.forum.post_controls.flag_button')}</Button>
<Button icon="fas fa-flag" onclick={() => app.modal.show(new FlagPostModal({post}))}>{app.translator.trans('flarum-flags.forum.post_controls.flag_button')}</Button>
);
});
}

2
extensions/flags/js/forum/src/components/FlagList.js
View File

@ -37,7 +37,7 @@ export default class FlagList extends Component {
if (!isInitialized) $(element).on('click', () => app.cache.flagIndex = post);
}}>
{avatar(post.user())}
{icon('fa fa-flag', {className: 'Notification-icon'})}
{icon('fas fa-flag', {className: 'Notification-icon'})}
<span className="Notification-content">
{app.translator.trans('flarum-flags.forum.flagged_posts.item_text', {username: username(post.user()), em: <em/>, discussion: post.discussion().title()})}
</span>

2
extensions/flags/js/forum/src/components/FlagsDropdown.js
View File

@ -5,7 +5,7 @@ import FlagList from 'flarum/flags/components/FlagList';
export default class FlagsDropdown extends NotificationsDropdown {
static initProps(props) {
props.label = props.label || app.translator.trans('flarum-flags.forum.flagged_posts.tooltip');
props.icon = props.icon || 'fa fa-flag';
props.icon = props.icon || 'fas fa-flag';
super.initProps(props);
}