diff --git a/gulpfile.js b/gulpfile.js index 90f8ebaabec9..07a8a99d693a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -19,8 +19,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:tabler-icons', () => + gulp.src('./packages/client/node_modules/@tabler/icons/iconfont/**/*').pipe(gulp.dest('./built/_client_dist_/tabler-icons/')) ); gulp.task('copy:client:locales', cb => { @@ -53,7 +53,7 @@ gulp.task('build:backend:style', () => { }); gulp.task('build', gulp.parallel( - 'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:fontawesome' + 'copy:client:locales', 'copy:backend:views', 'build:backend:script', 'build:backend:style', 'copy:client:fonts', 'copy:client:tabler-icons' )); gulp.task('default', gulp.task('build')); diff --git a/packages/backend/assets/notification-badges/LICENSE b/packages/backend/assets/notification-badges/LICENSE deleted file mode 100644 index 841c4c682b15..000000000000 --- a/packages/backend/assets/notification-badges/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -Font Awesome Icons -------------------------- - -Ⓒ Font Awesome -CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/) diff --git a/packages/backend/assets/notification-badges/at.png b/packages/backend/assets/notification-badges/at.png deleted file mode 100644 index d1492856de2b..000000000000 Binary files a/packages/backend/assets/notification-badges/at.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/check.png b/packages/backend/assets/notification-badges/check.png deleted file mode 100644 index baeb76babfa3..000000000000 Binary files a/packages/backend/assets/notification-badges/check.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/clipboard-check-solid.png b/packages/backend/assets/notification-badges/clipboard-check-solid.png deleted file mode 100644 index d8cdfa9da456..000000000000 Binary files a/packages/backend/assets/notification-badges/clipboard-check-solid.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/clock.png b/packages/backend/assets/notification-badges/clock.png deleted file mode 100644 index 9323f8f3070d..000000000000 Binary files a/packages/backend/assets/notification-badges/clock.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/comments.png b/packages/backend/assets/notification-badges/comments.png deleted file mode 100644 index bc8a1c35b442..000000000000 Binary files a/packages/backend/assets/notification-badges/comments.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/id-card-alt.png b/packages/backend/assets/notification-badges/id-card-alt.png deleted file mode 100644 index 67e1410e34cb..000000000000 Binary files a/packages/backend/assets/notification-badges/id-card-alt.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/plus.png b/packages/backend/assets/notification-badges/plus.png deleted file mode 100644 index 05362c122bd2..000000000000 Binary files a/packages/backend/assets/notification-badges/plus.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/poll-h.png b/packages/backend/assets/notification-badges/poll-h.png deleted file mode 100644 index 3b7ded665976..000000000000 Binary files a/packages/backend/assets/notification-badges/poll-h.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/quote-right.png b/packages/backend/assets/notification-badges/quote-right.png deleted file mode 100644 index 0fa483765481..000000000000 Binary files a/packages/backend/assets/notification-badges/quote-right.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/reply.png b/packages/backend/assets/notification-badges/reply.png deleted file mode 100644 index 77021f71a7af..000000000000 Binary files a/packages/backend/assets/notification-badges/reply.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/retweet.png b/packages/backend/assets/notification-badges/retweet.png deleted file mode 100644 index dc6106048107..000000000000 Binary files a/packages/backend/assets/notification-badges/retweet.png and /dev/null differ diff --git a/packages/backend/assets/notification-badges/user-plus.png b/packages/backend/assets/notification-badges/user-plus.png deleted file mode 100644 index 9d376d04d666..000000000000 Binary files a/packages/backend/assets/notification-badges/user-plus.png and /dev/null differ diff --git a/packages/backend/assets/tabler-badges/LICENSE b/packages/backend/assets/tabler-badges/LICENSE new file mode 100644 index 000000000000..cab2551f6760 --- /dev/null +++ b/packages/backend/assets/tabler-badges/LICENSE @@ -0,0 +1,24 @@ +Tabler Icons +https://github.com/tabler/tabler-icons/blob/master/LICENSE +==== +MIT License + +Copyright (c) 2020-2022 Paweł Kuna + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/backend/assets/tabler-badges/antenna.png b/packages/backend/assets/tabler-badges/antenna.png new file mode 100644 index 000000000000..013c7f4e61ce Binary files /dev/null and b/packages/backend/assets/tabler-badges/antenna.png differ diff --git a/packages/backend/assets/tabler-badges/arrow-back-up.png b/packages/backend/assets/tabler-badges/arrow-back-up.png new file mode 100644 index 000000000000..a253384c72bc Binary files /dev/null and b/packages/backend/assets/tabler-badges/arrow-back-up.png differ diff --git a/packages/backend/assets/tabler-badges/at.png b/packages/backend/assets/tabler-badges/at.png new file mode 100644 index 000000000000..cbf8df4925a5 Binary files /dev/null and b/packages/backend/assets/tabler-badges/at.png differ diff --git a/packages/backend/assets/tabler-badges/chart-arrows.png b/packages/backend/assets/tabler-badges/chart-arrows.png new file mode 100644 index 000000000000..b2b8a2d99367 Binary files /dev/null and b/packages/backend/assets/tabler-badges/chart-arrows.png differ diff --git a/packages/backend/assets/tabler-badges/circle-check.png b/packages/backend/assets/tabler-badges/circle-check.png new file mode 100644 index 000000000000..6464d5133cc8 Binary files /dev/null and b/packages/backend/assets/tabler-badges/circle-check.png differ diff --git a/packages/backend/assets/tabler-badges/messages.png b/packages/backend/assets/tabler-badges/messages.png new file mode 100644 index 000000000000..fa5072ebba50 Binary files /dev/null and b/packages/backend/assets/tabler-badges/messages.png differ diff --git a/packages/backend/assets/notification-badges/null.png b/packages/backend/assets/tabler-badges/null.png similarity index 100% rename from packages/backend/assets/notification-badges/null.png rename to packages/backend/assets/tabler-badges/null.png diff --git a/packages/backend/assets/tabler-badges/plus.png b/packages/backend/assets/tabler-badges/plus.png new file mode 100644 index 000000000000..f13a86f4cdfa Binary files /dev/null and b/packages/backend/assets/tabler-badges/plus.png differ diff --git a/packages/backend/assets/tabler-badges/quote.png b/packages/backend/assets/tabler-badges/quote.png new file mode 100644 index 000000000000..e0fc6f3fb428 Binary files /dev/null and b/packages/backend/assets/tabler-badges/quote.png differ diff --git a/packages/backend/assets/tabler-badges/repeat.png b/packages/backend/assets/tabler-badges/repeat.png new file mode 100644 index 000000000000..ab548043f73b Binary files /dev/null and b/packages/backend/assets/tabler-badges/repeat.png differ diff --git a/packages/backend/assets/tabler-badges/user-plus.png b/packages/backend/assets/tabler-badges/user-plus.png new file mode 100644 index 000000000000..2ae96f0b7379 Binary files /dev/null and b/packages/backend/assets/tabler-badges/user-plus.png differ diff --git a/packages/backend/assets/tabler-badges/users.png b/packages/backend/assets/tabler-badges/users.png new file mode 100644 index 000000000000..7862963327a0 Binary files /dev/null and b/packages/backend/assets/tabler-badges/users.png differ diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index d44a8ddc1b47..9319cc8cbeee 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -34,7 +34,7 @@ html link(rel='prefetch' href='https://xn--931a.moe/assets/info.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg') link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg') - link(rel='stylesheet' href='/assets/fontawesome/css/all.css') + link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.css') link(rel='modulepreload' href=`/assets/${clientEntry.file}`) each href in clientEntry.css diff --git a/packages/client/package.json b/packages/client/package.json index c90c7f9667b6..742dcfe9f9ce 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -11,12 +11,13 @@ }, "dependencies": { "@discordapp/twemoji": "14.0.2", - "@fortawesome/fontawesome-free": "6.1.2", - "@rollup/plugin-alias": "3.1.9", - "@rollup/plugin-json": "4.1.0", + "@rollup/plugin-alias": "4.0.2", + "@rollup/plugin-json": "6.0.0", + "@rollup/pluginutils": "5.0.2", "@syuilo/aiscript": "0.11.1", - "@vitejs/plugin-vue": "3.1.0", - "@vue/compiler-sfc": "3.2.39", + "@tabler/icons": "^1.117.0", + "@vitejs/plugin-vue": "4.0.0", + "@vue/compiler-sfc": "3.2.45", "autobind-decorator": "2.4.0", "autosize": "5.0.1", "blurhash": "1.1.5", diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index 10257b841f59..1fbce355870d 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: 'ti ti-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: 'ti ti-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 1862d0a0e48e..03890b4e97ca 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/global/MkA.vue b/packages/client/src/components/global/MkA.vue index 67bf54def8a9..5a0ba0d8d3c6 100644 --- a/packages/client/src/components/global/MkA.vue +++ b/packages/client/src/components/global/MkA.vue @@ -41,25 +41,25 @@ function onContextmenu(ev) { type: 'label', text: props.to, }, { - icon: 'fas fa-window-maximize', + icon: 'ti ti-app-window', text: i18n.ts.openInWindow, action: () => { os.pageWindow(props.to); }, }, { - icon: 'fas fa-expand-alt', + icon: 'ti ti-player-eject', text: i18n.ts.showInPage, action: () => { router.push(props.to, 'forcePage'); }, }, null, { - icon: 'fas fa-external-link-alt', + icon: 'ti ti-external-link', text: i18n.ts.openInNewTab, action: () => { window.open(props.to, '_blank'); }, }, { - icon: 'fas fa-link', + icon: 'ti ti-link', text: i18n.ts.copyLink, action: () => { copyToClipboard(`${url}${props.to}`); diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue index 8161ef3792aa..a80efb142cb9 100644 --- a/packages/client/src/components/global/MkAd.vue +++ b/packages/client/src/components/global/MkAd.vue @@ -3,7 +3,7 @@
- +
diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue index 6e75a69ec316..e135d4184bb5 100644 --- a/packages/client/src/components/global/MkError.vue +++ b/packages/client/src/components/global/MkError.vue @@ -2,7 +2,7 @@
-

{{ i18n.ts.somethingHappened }}

+

{{ i18n.ts.somethingHappened }}

{{ i18n.ts.retry }}
diff --git a/packages/client/src/components/global/MkLoading.vue b/packages/client/src/components/global/MkLoading.vue index bcf592523415..72776ada5645 100644 --- a/packages/client/src/components/global/MkLoading.vue +++ b/packages/client/src/components/global/MkLoading.vue @@ -1,6 +1,6 @@ diff --git a/packages/client/src/components/page/page.post.vue b/packages/client/src/components/page/page.post.vue index f6551963596f..48ab5878c93d 100644 --- a/packages/client/src/components/page/page.post.vue +++ b/packages/client/src/components/page/page.post.vue @@ -2,8 +2,8 @@
- - + +
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index 03e00b1c173c..31e6cd64a4f7 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -9,97 +9,97 @@ import { unisonReload } from '@/scripts/unison-reload'; export const navbarItemDef = reactive({ notifications: { title: 'notifications', - icon: 'fas fa-bell', + icon: 'ti ti-bell', show: computed(() => $i != null), indicated: computed(() => $i != null && $i.hasUnreadNotification), to: '/my/notifications', }, messaging: { title: 'messaging', - icon: 'fas fa-comments', + icon: 'ti ti-messages', show: computed(() => $i != null), indicated: computed(() => $i != null && $i.hasUnreadMessagingMessage), to: '/my/messaging', }, drive: { title: 'drive', - icon: 'fas fa-cloud', + icon: 'ti ti-cloud', show: computed(() => $i != null), to: '/my/drive', }, followRequests: { title: 'followRequests', - icon: 'fas fa-user-clock', + icon: 'ti ti-user-plus', show: computed(() => $i != null && $i.isLocked), indicated: computed(() => $i != null && $i.hasPendingReceivedFollowRequest), to: '/my/follow-requests', }, explore: { title: 'explore', - icon: 'fas fa-hashtag', + icon: 'ti ti-hash', to: '/explore', }, announcements: { title: 'announcements', - icon: 'fas fa-broadcast-tower', + icon: 'ti ti-speakerphone', indicated: computed(() => $i != null && $i.hasUnreadAnnouncement), to: '/announcements', }, search: { title: 'search', - icon: 'fas fa-search', + icon: 'ti ti-search', action: () => search(), }, lists: { title: 'lists', - icon: 'fas fa-list-ul', + icon: 'ti ti-list', show: computed(() => $i != null), to: '/my/lists', }, /* groups: { title: 'groups', - icon: 'fas fa-users', + icon: 'ti ti-users', show: computed(() => $i != null), to: '/my/groups', }, */ antennas: { title: 'antennas', - icon: 'fas fa-satellite', + icon: 'ti ti-antenna', show: computed(() => $i != null), to: '/my/antennas', }, favorites: { title: 'favorites', - icon: 'fas fa-star', + icon: 'ti ti-star', show: computed(() => $i != null), to: '/my/favorites', }, pages: { title: 'pages', - icon: 'fas fa-file-alt', + icon: 'ti ti-news', to: '/pages', }, gallery: { title: 'gallery', - icon: 'fas fa-icons', + icon: 'ti ti-icons', to: '/gallery', }, clips: { title: 'clip', - icon: 'fas fa-paperclip', + icon: 'ti ti-paperclip', show: computed(() => $i != null), to: '/my/clips', }, channels: { title: 'channel', - icon: 'fas fa-satellite-dish', + icon: 'ti ti-device-tv', to: '/channels', }, ui: { title: 'switchUi', - icon: 'fas fa-columns', + icon: 'ti ti-devices', action: (ev) => { os.popupMenu([{ text: i18n.ts.default, @@ -127,7 +127,7 @@ export const navbarItemDef = reactive({ }, reload: { title: 'reload', - icon: 'fas fa-refresh', + icon: 'ti ti-refresh', action: (ev) => { location.reload(); }, diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue index a90a023cb67f..232d52534734 100644 --- a/packages/client/src/pages/_error_.vue +++ b/packages/client/src/pages/_error_.vue @@ -3,7 +3,7 @@
-

{{ i18n.ts.pageLoadError }}

+

{{ i18n.ts.pageLoadError }}

{{ i18n.ts.pageLoadErrorDescription }}

{{ i18n.ts.serverIsDead }}

- +
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue index a9da89ed959f..3e1562289824 100644 --- a/packages/client/src/pages/messaging/messaging-room.vue +++ b/packages/client/src/pages/messaging/messaging-room.vue @@ -40,7 +40,7 @@
- +
@@ -285,7 +285,7 @@ definePageMetadata(computed(() => !fetching ? user ? { avatar: user, } : { title: group?.name, - icon: 'fas fa-users', + icon: 'ti ti-users', } : null)); diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index bd8ae4e0b696..7c85dfb7adf6 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -351,7 +351,7 @@ let preview_plain = $ref('**bold** @mention #hashtag `code` $[x2 🍮]

diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue index dc10bece8148..005b036696c1 100644 --- a/packages/client/src/pages/my-antennas/create.vue +++ b/packages/client/src/pages/my-antennas/create.vue @@ -37,7 +37,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageAntennas, - icon: 'fas fa-satellite', + icon: 'ti ti-antenna', }); diff --git a/packages/client/src/pages/my-antennas/edit.vue b/packages/client/src/pages/my-antennas/edit.vue index 53f9b07db06b..cb583faaeb53 100644 --- a/packages/client/src/pages/my-antennas/edit.vue +++ b/packages/client/src/pages/my-antennas/edit.vue @@ -34,7 +34,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageAntennas, - icon: 'fas fa-satellite', + icon: 'ti ti-antenna', }); diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue index 054053fbfbba..a409a734b571 100644 --- a/packages/client/src/pages/my-antennas/editor.vue +++ b/packages/client/src/pages/my-antennas/editor.vue @@ -38,8 +38,8 @@ {{ i18n.ts.notifyAntenna }}
- {{ i18n.ts.save }} - {{ i18n.ts.delete }} + {{ i18n.ts.save }} + {{ i18n.ts.delete }}
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue index dc73ba674e1d..9daf23f9b517 100644 --- a/packages/client/src/pages/my-antennas/index.vue +++ b/packages/client/src/pages/my-antennas/index.vue @@ -2,7 +2,7 @@
- {{ i18n.ts.add }} + {{ i18n.ts.add }}
@@ -33,7 +33,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageAntennas, - icon: 'fas fa-satellite', + icon: 'ti ti-antenna', }); diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue index 68330d6db44b..dd6b5b3a37f6 100644 --- a/packages/client/src/pages/my-clips/index.vue +++ b/packages/client/src/pages/my-clips/index.vue @@ -3,7 +3,7 @@
- {{ i18n.ts.add }} + {{ i18n.ts.add }} @@ -70,9 +70,9 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.clip, - icon: 'fas fa-paperclip', + icon: 'ti ti-paperclip', action: { - icon: 'fas fa-plus', + icon: 'ti ti-plus', handler: create, }, }); diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue index 9af7c0d10591..3476436b27da 100644 --- a/packages/client/src/pages/my-lists/index.vue +++ b/packages/client/src/pages/my-lists/index.vue @@ -3,7 +3,7 @@
- {{ i18n.ts.createList }} + {{ i18n.ts.createList }} @@ -47,9 +47,9 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageLists, - icon: 'fas fa-list-ul', + icon: 'ti ti-list', action: { - icon: 'fas fa-plus', + icon: 'ti ti-plus', handler: create, }, }); diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue index d90453526e2b..f6234ffe4493 100644 --- a/packages/client/src/pages/my-lists/list.vue +++ b/packages/client/src/pages/my-lists/list.vue @@ -25,7 +25,7 @@
- +
@@ -122,7 +122,7 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => list ? { title: list.name, - icon: 'fas fa-list-ul', + icon: 'ti ti-list', } : null)); diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue index 253ecdb23526..e58e44ef79ab 100644 --- a/packages/client/src/pages/not-found.vue +++ b/packages/client/src/pages/not-found.vue @@ -17,6 +17,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.notFound, - icon: 'fas fa-exclamation-triangle', + icon: 'ti ti-alert-triangle', }); diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue index 6509cb306efb..ba2bb9123913 100644 --- a/packages/client/src/pages/note.vue +++ b/packages/client/src/pages/note.vue @@ -10,7 +10,7 @@
- +
@@ -25,7 +25,7 @@
- +
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue index dd57060fdab3..7106951de284 100644 --- a/packages/client/src/pages/notifications.vue +++ b/packages/client/src/pages/notifications.vue @@ -50,7 +50,7 @@ function setFilter(ev) { }, })); const items = includeTypes != null ? [{ - icon: 'fas fa-times', + icon: 'ti ti-x', text: i18n.ts.clear, action: () => { includeTypes = null; @@ -61,12 +61,12 @@ function setFilter(ev) { const headerActions = $computed(() => [tab === 'all' ? { text: i18n.ts.filter, - icon: 'fas fa-filter', + icon: 'ti ti-filter', highlighted: includeTypes != null, handler: setFilter, } : undefined, tab === 'all' ? { text: i18n.ts.markAllAsRead, - icon: 'fas fa-check', + icon: 'ti ti-check', handler: () => { os.apiWithDialog('notifications/mark-all-as-read'); }, @@ -81,15 +81,15 @@ const headerTabs = $computed(() => [{ }, { key: 'mentions', title: i18n.ts.mentions, - icon: 'fas fa-at', + icon: 'ti ti-at', }, { key: 'directNotes', title: i18n.ts.directNotes, - icon: 'fas fa-envelope', + icon: 'ti ti-mail', }]); definePageMetadata(computed(() => ({ title: i18n.ts.notifications, - icon: 'fas fa-bell', + icon: 'ti ti-bell', }))); diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue index 4c2e0e4eb44c..0438969afa04 100644 --- a/packages/client/src/pages/page-editor/els/page-editor.el.button.vue +++ b/packages/client/src/pages/page-editor/els/page-editor.el.button.vue @@ -1,7 +1,7 @@