From 52cbe07a780c0542912798e1e9bc1b78a63d6806 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 19 Dec 2022 13:54:35 +0900 Subject: [PATCH] Revert "wip" This reverts commit f83bd31fd5fee0bb2209ad0e5359ffa473ffb30e. --- .../backend/src/server/web/views/base.pug | 2 +- packages/client/src/account.ts | 2 +- .../src/components/MkAbuseReportWindow.vue | 2 +- .../src/components/MkChannelFollowButton.vue | 4 +-- packages/client/src/components/MkDialog.vue | 2 +- .../client/src/components/MkDrive.file.vue | 4 +-- .../client/src/components/MkDrive.folder.vue | 2 +- .../src/components/MkDrive.navFolder.vue | 2 +- packages/client/src/components/MkDrive.vue | 6 ++-- .../client/src/components/MkEmojiPicker.vue | 2 +- .../client/src/components/MkFollowButton.vue | 6 ++-- packages/client/src/components/MkGoogle.vue | 2 +- .../src/components/MkModalPageWindow.vue | 6 ++-- .../client/src/components/MkModalWindow.vue | 2 +- packages/client/src/components/MkNote.vue | 18 ++++++------ .../client/src/components/MkNoteDetailed.vue | 18 ++++++------ .../client/src/components/MkNotification.vue | 8 +++--- .../client/src/components/MkPageWindow.vue | 6 ++-- packages/client/src/components/MkPoll.vue | 2 +- packages/client/src/components/MkPostForm.vue | 10 +++---- .../client/src/components/MkRenoteButton.vue | 4 +-- packages/client/src/components/MkSignup.vue | 10 +++---- .../src/components/MkSubNoteContent.vue | 2 +- .../client/src/components/MkVisibility.vue | 2 +- .../src/components/MkVisibilityPicker.vue | 4 +-- .../client/src/components/MkWaitingDialog.vue | 2 +- packages/client/src/components/MkWidgets.vue | 6 ++-- .../client/src/components/form/checkbox.vue | 2 +- packages/client/src/components/form/input.vue | 2 +- packages/client/src/components/form/link.vue | 2 +- packages/client/src/components/global/MkA.vue | 4 +-- .../client/src/components/page/page.post.vue | 4 +-- packages/client/src/navbar.ts | 14 +++++----- packages/client/src/pages/about-misskey.vue | 2 +- packages/client/src/pages/about.emojis.vue | 2 +- .../client/src/pages/about.federation.vue | 2 +- packages/client/src/pages/about.vue | 2 +- packages/client/src/pages/admin-file.vue | 4 +-- packages/client/src/pages/admin/abuses.vue | 2 +- packages/client/src/pages/admin/ads.vue | 4 +-- .../client/src/pages/admin/announcements.vue | 4 +-- .../client/src/pages/admin/email-settings.vue | 2 +- .../src/pages/admin/emoji-edit-dialog.vue | 2 +- packages/client/src/pages/admin/emojis.vue | 10 +++---- packages/client/src/pages/admin/files.vue | 6 ++-- packages/client/src/pages/admin/index.vue | 24 ++++++++-------- .../client/src/pages/admin/integrations.vue | 2 +- .../client/src/pages/admin/object-storage.vue | 4 +-- .../client/src/pages/admin/other-settings.vue | 4 +-- packages/client/src/pages/admin/relays.vue | 8 +++--- packages/client/src/pages/admin/security.vue | 2 +- packages/client/src/pages/admin/settings.vue | 12 ++++---- packages/client/src/pages/admin/users.vue | 6 ++-- packages/client/src/pages/announcements.vue | 2 +- .../client/src/pages/antenna-timeline.vue | 2 +- packages/client/src/pages/api-console.vue | 2 +- packages/client/src/pages/channel-editor.vue | 4 +-- packages/client/src/pages/channel.vue | 2 +- packages/client/src/pages/channels.vue | 4 +-- packages/client/src/pages/clip.vue | 4 +-- packages/client/src/pages/drive.vue | 2 +- packages/client/src/pages/emojis.emoji.vue | 2 +- packages/client/src/pages/explore.users.vue | 6 ++-- packages/client/src/pages/explore.vue | 4 +-- packages/client/src/pages/favorites.vue | 2 +- packages/client/src/pages/follow-requests.vue | 2 +- packages/client/src/pages/gallery/edit.vue | 4 +-- packages/client/src/pages/gallery/index.vue | 4 +-- packages/client/src/pages/gallery/post.vue | 4 +-- packages/client/src/pages/instance-info.vue | 2 +- packages/client/src/pages/messaging/index.vue | 4 +-- .../pages/messaging/messaging-room.form.vue | 2 +- .../client/src/pages/my-antennas/index.vue | 2 +- packages/client/src/pages/my-clips/index.vue | 6 ++-- packages/client/src/pages/my-lists/index.vue | 4 +-- packages/client/src/pages/notifications.vue | 4 +-- .../page-editor/els/page-editor.el.if.vue | 2 +- .../page-editor/els/page-editor.el.post.vue | 2 +- .../els/page-editor.el.section.vue | 2 +- .../page-editor/page-editor.container.vue | 2 +- .../src/pages/page-editor/page-editor.vue | 14 +++++----- packages/client/src/pages/page.vue | 4 +-- packages/client/src/pages/pages.vue | 4 +-- packages/client/src/pages/registry.keys.vue | 2 +- packages/client/src/pages/registry.value.vue | 2 +- packages/client/src/pages/registry.vue | 2 +- packages/client/src/pages/search.vue | 2 +- .../client/src/pages/settings/accounts.vue | 4 +-- packages/client/src/pages/settings/apps.vue | 2 +- packages/client/src/pages/settings/drive.vue | 2 +- packages/client/src/pages/settings/email.vue | 2 +- .../client/src/pages/settings/general.vue | 2 +- packages/client/src/pages/settings/index.vue | 12 ++++---- .../client/src/pages/settings/integration.vue | 2 +- .../src/pages/settings/notifications.vue | 4 +-- packages/client/src/pages/settings/other.vue | 4 +-- .../src/pages/settings/plugin.install.vue | 2 +- packages/client/src/pages/settings/plugin.vue | 4 +-- .../client/src/pages/settings/profile.vue | 4 +-- .../client/src/pages/settings/reaction.vue | 2 +- .../client/src/pages/settings/security.vue | 2 +- .../src/pages/settings/theme.install.vue | 2 +- .../src/pages/settings/theme.manage.vue | 2 +- packages/client/src/pages/settings/theme.vue | 2 +- .../src/pages/settings/webhook.edit.vue | 2 +- .../client/src/pages/settings/webhook.new.vue | 2 +- .../client/src/pages/settings/webhook.vue | 2 +- packages/client/src/pages/share.vue | 2 +- packages/client/src/pages/tag.vue | 2 +- packages/client/src/pages/theme-editor.vue | 2 +- .../client/src/pages/timeline.tutorial.vue | 2 +- packages/client/src/pages/timeline.vue | 10 +++---- .../client/src/pages/user-list-timeline.vue | 2 +- packages/client/src/pages/user/home.vue | 2 +- .../client/src/pages/user/index.activity.vue | 2 +- packages/client/src/pages/user/index.vue | 4 +-- .../client/src/pages/welcome.entrance.a.vue | 2 +- .../client/src/pages/welcome.entrance.c.vue | 2 +- .../client/src/pages/welcome.timeline.vue | 2 +- packages/client/src/scripts/get-note-menu.ts | 28 +++++++++---------- packages/client/src/scripts/get-user-menu.ts | 4 +-- packages/client/src/scripts/hpml/lib.ts | 6 ++-- packages/client/src/scripts/select-file.ts | 4 +-- packages/client/src/style.scss | 5 ---- .../src/ui/_common_/navbar-for-mobile.vue | 6 ++-- packages/client/src/ui/_common_/navbar.vue | 6 ++-- packages/client/src/ui/classic.header.vue | 6 ++-- packages/client/src/ui/classic.sidebar.vue | 6 ++-- packages/client/src/ui/classic.widgets.vue | 2 +- packages/client/src/ui/deck.vue | 10 +++---- packages/client/src/ui/deck/column.vue | 4 +-- .../src/ui/deck/notifications-column.vue | 2 +- packages/client/src/ui/deck/tl-column.vue | 10 +++---- packages/client/src/ui/universal.vue | 4 +-- packages/client/src/ui/universal.widgets.vue | 2 +- packages/client/src/ui/visitor/b.vue | 4 +-- packages/client/src/ui/visitor/header.vue | 6 ++-- packages/client/src/widgets/federation.vue | 2 +- packages/client/src/widgets/notifications.vue | 4 +-- packages/client/src/widgets/rss-ticker.vue | 2 +- packages/client/src/widgets/rss.vue | 2 +- packages/client/src/widgets/timeline.vue | 16 +++++------ packages/client/src/widgets/trends.vue | 2 +- 143 files changed, 306 insertions(+), 311 deletions(-) diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 472defa10..7d802d37c 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='https://unpkg.com/@tabler/icons@1.117.0/iconfont/tabler-icons.min.css') + link(rel='stylesheet' href='/assets/fontawesome/css/all.css') link(rel='modulepreload' href=`/assets/${clientEntry.file}`) if Array.isArray(clientEntry.css) diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index e981536dd..e9c29d6b0 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -213,7 +213,7 @@ export async function openAccountMenu(opts: { avatar: $i, }, null, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, { type: 'parent', - icon: 'ti ti-plus', + icon: 'fas fa-plus', text: i18n.ts.addAccount, children: [{ text: i18n.ts.existingAccount, diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 03890b4e9..1862d0a0e 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/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue index b42f28394..fcf1329ff 100644 --- a/packages/client/src/pages/settings/webhook.new.vue +++ b/packages/client/src/pages/settings/webhook.new.vue @@ -26,7 +26,7 @@
- {{ i18n.ts.create }} + {{ i18n.ts.create }}
diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue index d3ad475cd..1a7e73940 100644 --- a/packages/client/src/pages/settings/webhook.vue +++ b/packages/client/src/pages/settings/webhook.vue @@ -13,7 +13,7 @@ {{ webhook.name || webhook.url }} diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue index a7e797eea..69d22ed63 100644 --- a/packages/client/src/pages/share.vue +++ b/packages/client/src/pages/share.vue @@ -158,7 +158,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.share, - icon: 'ti ti-share', + icon: 'fas fa-share-alt', }); diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue index 72775ed5c..5498c2999 100644 --- a/packages/client/src/pages/tag.vue +++ b/packages/client/src/pages/tag.vue @@ -30,6 +30,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: props.tag, - icon: 'ti ti-hash', + icon: 'fas fa-hashtag', }))); diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index f0435427e..7dfeee16e 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -215,7 +215,7 @@ const headerActions = $computed(() => [{ handler: showPreview, }, { asFullButton: true, - icon: 'ti ti-check', + icon: 'fas fa-check', text: i18n.ts.saveAs, handler: saveAs, }]); diff --git a/packages/client/src/pages/timeline.tutorial.vue b/packages/client/src/pages/timeline.tutorial.vue index b1a1af138..9683cc22a 100644 --- a/packages/client/src/pages/timeline.tutorial.vue +++ b/packages/client/src/pages/timeline.tutorial.vue @@ -71,7 +71,7 @@ {{ i18n.ts.noThankYou }} diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 8c2dc92cc..9d4299702 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -114,22 +114,22 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => [{ key: 'home', title: i18n.ts._timelines.home, - icon: 'ti ti-home-2', + icon: 'fas fa-home', iconOnly: true, }, ...(isLocalTimelineAvailable ? [{ key: 'local', title: i18n.ts._timelines.local, - icon: 'ti ti-messages', + icon: 'fas fa-comments', iconOnly: true, }, { key: 'social', title: i18n.ts._timelines.social, - icon: 'ti ti-share', + icon: 'fas fa-share-alt', iconOnly: true, }] : []), ...(isGlobalTimelineAvailable ? [{ key: 'global', title: i18n.ts._timelines.global, - icon: 'ti ti-world', + icon: 'fas fa-globe', iconOnly: true, }] : []), { icon: 'fas fa-list-ul', @@ -150,7 +150,7 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.timeline, - icon: src === 'local' ? 'ti ti-messages' : src === 'social' ? 'ti ti-share' : src === 'global' ? 'ti ti-world' : 'ti ti-home-2', + icon: src === 'local' ? 'fas fa-comments' : src === 'social' ? 'fas fa-share-alt' : src === 'global' ? 'fas fa-globe' : 'fas fa-home', }))); diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue index 773b20d80..4a534e47b 100644 --- a/packages/client/src/pages/user-list-timeline.vue +++ b/packages/client/src/pages/user-list-timeline.vue @@ -69,7 +69,7 @@ const headerActions = $computed(() => list ? [{ text: i18n.ts.jumpToSpecifiedDate, handler: timetravel, }, { - icon: 'ti ti-settings', + icon: 'fas fa-cog', text: i18n.ts.settings, handler: settings, }] : []); diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 98c7e9d11..352db4616 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -25,7 +25,7 @@ {{ i18n.ts.followsYou }}
- +
diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue index 7f25176e8..630a2cea7 100644 --- a/packages/client/src/pages/user/index.activity.vue +++ b/packages/client/src/pages/user/index.activity.vue @@ -3,7 +3,7 @@ diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index 21f1d25df..7e635f8b2 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -69,7 +69,7 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => user ? [{ key: 'home', title: i18n.ts.overview, - icon: 'ti ti-home-2', + icon: 'fas fa-home', }, ...($i && ($i.id === user.id)) || user.publicReactions ? [{ key: 'reactions', title: i18n.ts.reaction, @@ -77,7 +77,7 @@ const headerTabs = $computed(() => user ? [{ }] : [], { key: 'clips', title: i18n.ts.clips, - icon: 'ti ti-paperclip', + icon: 'fas fa-paperclip', }, { key: 'pages', title: i18n.ts.pages, diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 119ba96ec..827162a0c 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -15,7 +15,7 @@
- +

diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index 535580e72..a590834a4 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -41,7 +41,7 @@

- +