diff --git a/CALCKEY.md b/CALCKEY.md index 8e979b4b69..7f74e77e09 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -48,6 +48,7 @@ - Star as default reaction - Like/star button - Rosé Pine by default (+ non-themable elements made Rosé Pine) +- Phosphor icons instead of FontAwesome - Better sidebar/navbar - Add back groups - Integrate groups UI into chats UI diff --git a/gulpfile.js b/gulpfile.js index 2eaeac0f34..17d2241771 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,8 +23,8 @@ gulp.task('copy:client:fonts', () => gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/')) ); -gulp.task('copy:client:fontawesome', () => - gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/')) +gulp.task('copy:client:phosphor', () => + gulp.src('./packages/client/node_modules/phosphor-icons/src/css/*').pipe(gulp.dest('./built/_client_dist_/phosphor/')) ); gulp.task('copy:client:locales', cb => { @@ -58,7 +58,7 @@ gulp.task('build:backend:style', () => { }); gulp.task('build', gulp.parallel( - 'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome' + 'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:phosphor' )); gulp.task('default', gulp.task('build')); diff --git a/package.json b/package.json index aead92a278..915d93cf90 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.8.1", + "version": "12.119.0-calc.8.2", "codename": "aqua", "repository": { "type": "git", @@ -51,6 +51,7 @@ "gulp-terser": "2.1.0", "js-yaml": "4.1.0", "long": "^5.2.1", + "phosphor-icons": "^1.4.2", "seedrandom": "^3.0.5" }, "devDependencies": { diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index f06f2cab2d..a1a6c3a4e7 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -35,7 +35,7 @@ html link(rel='prefetch' href=`/static-assets/badges/info.png?${ nowDateMs }`) link(rel='prefetch' href=`/static-assets/badges/not-found.png?${ nowDateMs }`) link(rel='prefetch' href=`/static-assets/badges/error.png?${ nowDateMs }`) - link(rel='stylesheet' href='/assets/fontawesome/css/all.css') + link(rel='stylesheet' href='/assets/phosphor/css/icons.css') link(rel='stylesheet' href=`/static-assets/instance.css?${ nowDateMs }`) link(rel='modulepreload' href=`/assets/${clientEntry.file}`) diff --git a/packages/client/package.json b/packages/client/package.json index af43f28620..3441278dfa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -8,7 +8,6 @@ }, "dependencies": { "@discordapp/twemoji": "14.0.2", - "@fortawesome/fontawesome-free": "6.2.0", "@rollup/plugin-alias": "3.1.9", "@rollup/plugin-json": "4.1.0", "@rollup/pluginutils": "^4.2.1", diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index 10257b841f..8421ad23d1 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -207,7 +207,7 @@ export async function openAccountMenu(opts: { avatar: $i, }, null, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, { type: 'parent', - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.addAccount, children: [{ text: i18n.ts.existingAccount, @@ -218,7 +218,7 @@ export async function openAccountMenu(opts: { }], }, { type: 'link', - icon: 'fas fa-users', + icon: 'ph-users', text: i18n.ts.manageAccounts, to: '/settings/accounts', }]], ev.currentTarget ?? ev.target, { diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 1862d0a0e4..b52e5814c1 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -1,7 +1,7 @@