github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-26 10:14:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from afrastgeek/master

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

2
extensions/sticky/composer.json
View File

@ -29,7 +29,7 @@
"flarum-extension": { "flarum-extension": {
"title": "Sticky", "title": "Sticky",
"icon": { "icon": {
"name": "fa fa-thumbtack", "name": "fas fa-thumbtack",
"backgroundColor": "#D13E32", "backgroundColor": "#D13E32",
"color": "#fff" "color": "#fff"
} }

2
extensions/sticky/js/admin/src/main.js
View File

@ -5,7 +5,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
app.initializers.add('flarum-sticky', () => { app.initializers.add('flarum-sticky', () => {
extend(PermissionGrid.prototype, 'moderateItems', items => { extend(PermissionGrid.prototype, 'moderateItems', items => {
items.add('sticky', { items.add('sticky', {
icon: 'fa fa-thumbtack', icon: 'fas fa-thumbtack',
label: app.translator.trans('flarum-sticky.admin.permissions.sticky_discussions_label'), label: app.translator.trans('flarum-sticky.admin.permissions.sticky_discussions_label'),
permission: 'discussion.sticky' permission: 'discussion.sticky'
}, 95); }, 95);

2
extensions/sticky/js/forum/src/addStickyBadge.js
View File

@ -8,7 +8,7 @@ export default function addStickyBadge() {
badges.add('sticky', Badge.component({ badges.add('sticky', Badge.component({
type: 'sticky', type: 'sticky',
label: app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip'), label: app.translator.trans('flarum-sticky.forum.badge.sticky_tooltip'),
icon: 'fa fa-thumbtack' icon: 'fas fa-thumbtack'
}), 10); }), 10);
} }
}); });

2
extensions/sticky/js/forum/src/addStickyControl.js
View File

@ -8,7 +8,7 @@ export default function addStickyControl() {
if (discussion.canSticky()) { if (discussion.canSticky()) {
items.add('sticky', Button.component({ items.add('sticky', Button.component({
children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'), children: app.translator.trans(discussion.isSticky() ? 'flarum-sticky.forum.discussion_controls.unsticky_button' : 'flarum-sticky.forum.discussion_controls.sticky_button'),
icon: 'fa fa-thumbtack', icon: 'fas fa-thumbtack',
onclick: this.stickyAction.bind(discussion) onclick: this.stickyAction.bind(discussion)
})); }));
} }

2
extensions/sticky/js/forum/src/components/DiscussionStickiedPost.js
View File

@ -2,7 +2,7 @@ import EventPost from 'flarum/components/EventPost';
export default class DiscussionStickiedPost extends EventPost { export default class DiscussionStickiedPost extends EventPost {
icon() { icon() {
return 'fa fa-thumbtack'; return 'fas fa-thumbtack';
} }
descriptionKey() { descriptionKey() {