From 25068f12f5e584df120efb0e0aa4ee38df7074c8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Dec 2017 13:10:31 +0900 Subject: [PATCH] wip --- gulpfile.ts | 10 ++++++--- package.json | 2 ++ src/web/app/common/tags/messaging/form.tag | 2 +- src/web/app/common/tags/nav-links.tag | 2 +- src/web/app/common/tags/stream-indicator.tag | 4 ++-- .../desktop/tags/drive/base-contextmenu.tag | 4 ++-- .../desktop/tags/drive/file-contextmenu.tag | 2 +- .../desktop/tags/drive/folder-contextmenu.tag | 4 ++-- src/web/app/desktop/tags/drive/folder.tag | 2 +- .../tags/home-widgets/recommended-polls.tag | 4 ++-- .../app/desktop/tags/home-widgets/trends.tag | 2 +- .../tags/home-widgets/user-recommendation.tag | 2 +- src/web/app/desktop/tags/notifications.tag | 2 +- src/web/app/desktop/tags/post-form.tag | 2 +- .../tags/select-file-from-drive-window.tag | 2 +- .../tags/select-folder-from-drive-window.tag | 2 +- src/web/app/desktop/tags/settings.tag | 4 ++-- src/web/app/desktop/tags/timeline.tag | 4 ++-- src/web/app/desktop/tags/ui.tag | 7 +++--- src/web/app/desktop/tags/user.tag | 4 ++-- src/web/app/desktop/tags/widgets/activity.tag | 2 +- src/web/app/desktop/tags/window.tag | 2 +- src/web/app/mobile/tags/drive/file-viewer.tag | 2 +- .../app/mobile/tags/notification-preview.tag | 2 +- src/web/app/mobile/tags/notification.tag | 2 +- src/web/app/mobile/tags/page/drive.tag | 2 +- src/web/app/mobile/tags/page/post.tag | 2 +- src/web/app/mobile/tags/page/settings.tag | 8 +++---- .../app/mobile/tags/page/settings/signin.tag | 2 +- .../app/mobile/tags/page/settings/twitter.tag | 2 +- src/web/app/mobile/tags/post-form.tag | 2 +- src/web/app/mobile/tags/ui.tag | 8 +++---- src/web/app/mobile/tags/user.tag | 2 +- webpack/module/rules/fa.ts | 22 ++++++++++++------- 34 files changed, 68 insertions(+), 59 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 95aeb6e06b..dd8fc7a63b 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -20,11 +20,15 @@ import * as mocha from 'gulp-mocha'; import * as replace from 'gulp-replace'; import * as htmlmin from 'gulp-htmlmin'; const uglifyes = require('uglify-es'); -const fontawesome = require('@fortawesome/fontawesome'); -const solid = require('@fortawesome/fontawesome-free-solid'); +import * as fontawesome from '@fortawesome/fontawesome'; +import * as regular from '@fortawesome/fontawesome-free-regular'; +import * as solid from '@fortawesome/fontawesome-free-solid'; +import * as brands from '@fortawesome/fontawesome-free-brands'; -// Adds all the icons from the Solid style into our library for easy lookup +// Add icons +fontawesome.library.add(regular); fontawesome.library.add(solid); +fontawesome.library.add(brands); import version from './src/version'; diff --git a/package.json b/package.json index df82e1f67c..584d6bd103 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ }, "dependencies": { "@fortawesome/fontawesome": "^1.0.0", + "@fortawesome/fontawesome-free-brands": "^5.0.0", + "@fortawesome/fontawesome-free-regular": "^5.0.0", "@fortawesome/fontawesome-free-solid": "^5.0.0", "@prezzemolo/rap": "0.1.2", "@prezzemolo/zip": "0.0.3", diff --git a/src/web/app/common/tags/messaging/form.tag b/src/web/app/common/tags/messaging/form.tag index 9a687aebf2..7b133a71c4 100644 --- a/src/web/app/common/tags/messaging/form.tag +++ b/src/web/app/common/tags/messaging/form.tag @@ -9,7 +9,7 @@ %fa:upload%