From 7faa75d48334a6593378e2a9c33606c9401249f0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 17 Jun 2022 13:20:33 +0900 Subject: [PATCH 001/474] chore(client): tweak range control design --- packages/client/src/components/form/range.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index 07f2c2312..9bf765111 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/form/folder.vue b/packages/client/src/components/form/folder.vue index 1b960657d..c30db2b9e 100644 --- a/packages/client/src/components/form/folder.vue +++ b/packages/client/src/components/form/folder.vue @@ -5,8 +5,8 @@ - - + + diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue index 7165671af..d46e11381 100644 --- a/packages/client/src/components/form/input.vue +++ b/packages/client/src/components/form/input.vue @@ -28,7 +28,7 @@
- {{ $ts.save }} + {{ $ts.save }} diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue index 2ad55daca..331cca579 100644 --- a/packages/client/src/components/form/suspense.vue +++ b/packages/client/src/components/form/suspense.vue @@ -8,7 +8,7 @@
-
{{ $ts.somethingHappened }}
+
{{ $ts.somethingHappened }}
{{ $ts.retry }}
diff --git a/packages/client/src/components/form/switch.vue b/packages/client/src/components/form/switch.vue index fadb770ae..2107c6e9e 100644 --- a/packages/client/src/components/form/switch.vue +++ b/packages/client/src/components/form/switch.vue @@ -10,7 +10,7 @@ @keydown.enter="toggle" > - + diff --git a/packages/client/src/components/global/a.vue b/packages/client/src/components/global/a.vue index 5287d59b3..e8bff50a8 100644 --- a/packages/client/src/components/global/a.vue +++ b/packages/client/src/components/global/a.vue @@ -40,13 +40,13 @@ function onContextmenu(ev) { type: 'label', text: props.to, }, { - icon: 'fas fa-window-maximize', + icon: 'ph-frame-corners', text: i18n.ts.openInWindow, action: () => { os.pageWindow(props.to); } }, mkNav.sideViewHook ? { - icon: 'fas fa-columns', + icon: 'ph-layout', text: i18n.ts.openInSideView, action: () => { if (mkNav.sideViewHook) mkNav.sideViewHook(props.to); @@ -64,7 +64,7 @@ function onContextmenu(ev) { window.open(props.to, '_blank'); } }, { - icon: 'fas fa-link', + icon: 'ph-link', text: i18n.ts.copyLink, action: () => { copyToClipboard(`${url}${props.to}`); diff --git a/packages/client/src/components/global/ad.vue b/packages/client/src/components/global/ad.vue index 180dabb2a..6611f665c 100644 --- a/packages/client/src/components/global/ad.vue +++ b/packages/client/src/components/global/ad.vue @@ -3,7 +3,7 @@
- +
diff --git a/packages/client/src/components/global/error.vue b/packages/client/src/components/global/error.vue index 98b96fb41..c53eb0718 100644 --- a/packages/client/src/components/global/error.vue +++ b/packages/client/src/components/global/error.vue @@ -2,7 +2,7 @@
-

{{ $ts.somethingHappened }}

+

{{ $ts.somethingHappened }}

{{ $ts.retry }}
diff --git a/packages/client/src/components/google.vue b/packages/client/src/components/google.vue index bb4b439ee..e19c458ea 100644 --- a/packages/client/src/components/google.vue +++ b/packages/client/src/components/google.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue index ffefc1b08..6ceeafcca 100644 --- a/packages/client/src/components/launch-pad.vue +++ b/packages/client/src/components/launch-pad.vue @@ -17,11 +17,11 @@
- +
{{ $ts.help }}
 - +
{{ $t('aboutX', { x: instanceName }) }}
 diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue index 5093f11e9..c91726d33 100644 --- a/packages/client/src/components/media-banner.vue +++ b/packages/client/src/components/media-banner.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue index 5c38691e6..b59aef8c0 100644 --- a/packages/client/src/components/media-video.vue +++ b/packages/client/src/components/media-video.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/modal-page-window.vue b/packages/client/src/components/modal-page-window.vue index 21bdb657b..5493ab6a0 100644 --- a/packages/client/src/components/modal-page-window.vue +++ b/packages/client/src/components/modal-page-window.vue @@ -96,7 +96,7 @@ export default defineComponent({ text: this.$ts.showInPage, action: this.expand, }, this.sideViewHook ? { - icon: 'fas fa-columns', + icon: 'ph-layout', text: this.$ts.openInSideView, action: () => { this.sideViewHook(this.path); @@ -114,7 +114,7 @@ export default defineComponent({ this.$refs.window.close(); }, }, { - icon: 'fas fa-link', + icon: 'ph-link', text: this.$ts.copyLink, action: () => { copyToClipboard(this.url); diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue index 6234b710d..b4eb4c692 100644 --- a/packages/client/src/components/note-detailed.vue +++ b/packages/client/src/components/note-detailed.vue @@ -29,7 +29,7 @@ - +
@@ -46,7 +46,7 @@ - + @@ -63,7 +63,7 @@
({{ $ts.private }}) - + RN:
@@ -81,7 +81,7 @@
- {{ appearNote.channel.name }} + {{ appearNote.channel.name }}
@@ -91,13 +91,13 @@
diff --git a/packages/client/src/components/note.vue b/packages/client/src/components/note.vue index e5744d1ce..b3ab7b10f 100644 --- a/packages/client/src/components/note.vue +++ b/packages/client/src/components/note.vue @@ -31,7 +31,7 @@ - + @@ -49,7 +49,7 @@
({{ i18n.ts.private }}) - + RN:
@@ -70,18 +70,18 @@ {{ i18n.ts.showMore }}
- {{ appearNote.channel.name }} + {{ appearNote.channel.name }}
- - + +
-
{{ i18n.ts.quoteAttached }}
+
{{ i18n.ts.quoteAttached }}
{{ i18n.ts.recipient }}
@@ -35,7 +35,7 @@ - +
{{ i18n.ts.notSpecifiedMentionWarning }} - @@ -48,10 +48,10 @@
- - - - + + + +
diff --git a/packages/client/src/components/remote-caution.vue b/packages/client/src/components/remote-caution.vue index aa623f0fb..4f1a7905a 100644 --- a/packages/client/src/components/remote-caution.vue +++ b/packages/client/src/components/remote-caution.vue @@ -1,5 +1,5 @@ diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index 6cc2e387e..8fdded64a 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -96,7 +96,7 @@ const initStats = () => os.api('stats', { defineExpose({ [symbols.PAGE_INFO]: computed(() => ({ title: i18n.ts.instanceInfo, - icon: 'fas fa-info-circle', + icon: 'ph-info', bg: 'var(--bg)', tabs: [{ active: tab === 'overview', diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue index b18e08db9..368c6c08f 100644 --- a/packages/client/src/pages/admin/ads.vue +++ b/packages/client/src/pages/admin/ads.vue @@ -36,7 +36,7 @@
{{ i18n.ts.save }} - {{ i18n.ts.remove }} + {{ i18n.ts.remove }}
@@ -107,7 +107,7 @@ defineExpose({ bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.add, handler: add, }], diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue index 97774975d..1a3ee78de 100644 --- a/packages/client/src/pages/admin/announcements.vue +++ b/packages/client/src/pages/admin/announcements.vue @@ -14,7 +14,7 @@

{{ i18n.t('nUsersRead', { n: announcement.reads }) }}

{{ i18n.ts.save }} - {{ i18n.ts.remove }} + {{ i18n.ts.remove }}
@@ -87,11 +87,11 @@ function save(announcement) { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.announcements, - icon: 'fas fa-broadcast-tower', + icon: 'ph-megaphone', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.add, handler: add, }], diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue index aa1304319..340199632 100644 --- a/packages/client/src/pages/admin/email-settings.vue +++ b/packages/client/src/pages/admin/email-settings.vue @@ -105,7 +105,7 @@ function save() { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.emailServer, - icon: 'fas fa-envelope', + icon: 'ph-envelope-simple', bg: 'var(--bg)', actions: [{ asFullButton: true, @@ -113,7 +113,7 @@ defineExpose({ handler: testEmail, }, { asFullButton: true, - icon: 'fas fa-check', + icon: 'ph-check', text: i18n.ts.save, handler: save, }], diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue index d482fa49e..fc005387a 100644 --- a/packages/client/src/pages/admin/emoji-edit-dialog.vue +++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue @@ -21,7 +21,7 @@ - {{ $ts.delete }} + {{ $ts.delete }} diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index 8ca5b3d65..45e154e4b 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -3,7 +3,7 @@
- + @@ -36,7 +36,7 @@
- + @@ -158,14 +158,14 @@ const remoteMenu = (emoji, ev: MouseEvent) => { text: ':' + emoji.name + ':', }, { text: i18n.ts.import, - icon: 'fas fa-plus', + icon: 'ph-plus', action: () => { im(emoji); } }], ev.currentTarget ?? ev.target); }; const menu = (ev: MouseEvent) => { os.popupMenu([{ - icon: 'fas fa-download', + icon: 'ph-download-simple', text: i18n.ts.export, action: async () => { os.api('export-custom-emojis', { @@ -268,11 +268,11 @@ const delBulk = async () => { defineExpose({ [symbols.PAGE_INFO]: computed(() => ({ title: i18n.ts.customEmojis, - icon: 'fas fa-laugh', + icon: 'ph-smiley', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.addEmoji, handler: add, }, { diff --git a/packages/client/src/pages/admin/file-dialog.vue b/packages/client/src/pages/admin/file-dialog.vue index 0765548aa..3dc15459e 100644 --- a/packages/client/src/pages/admin/file-dialog.vue +++ b/packages/client/src/pages/admin/file-dialog.vue @@ -22,7 +22,7 @@
{{ $ts.user }} - {{ $ts.delete }} + {{ $ts.delete }}
diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue index 6f43c2b7b..a2912752a 100644 --- a/packages/client/src/pages/admin/files.vue +++ b/packages/client/src/pages/admin/files.vue @@ -109,15 +109,15 @@ async function find() { defineExpose({ [symbols.PAGE_INFO]: computed(() => ({ title: i18n.ts.files, - icon: 'fas fa-cloud', + icon: 'ph-cloud', bg: 'var(--bg)', actions: [{ text: i18n.ts.lookup, - icon: 'fas fa-search', + icon: 'ph-magnifying-glass', handler: find, }, { text: i18n.ts.clearCachedFiles, - icon: 'fas fa-trash-alt', + icon: 'ph-trash', handler: clear, }], })), diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 9b7fa5678..6aa7aefe0 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -43,7 +43,7 @@ const nav = new MisskeyNavigator(); const indexInfo = { title: i18n.ts.controlPanel, - icon: 'fas fa-cog', + icon: 'ph-gear', bg: 'var(--bg)', hideHeader: true, }; @@ -74,7 +74,7 @@ const menuDef = $computed(() => [{ title: i18n.ts.quickAction, items: [{ type: 'button', - icon: 'fas fa-search', + icon: 'ph-magnifying-glass', text: i18n.ts.lookup, action: lookup, }, ...(instance.disableRegistration ? [{ @@ -91,17 +91,17 @@ const menuDef = $computed(() => [{ to: '/admin/overview', active: props.initialPage === 'overview', }, { - icon: 'fas fa-users', + icon: 'ph-users-three', text: i18n.ts.users, to: '/admin/users', active: props.initialPage === 'users', }, { - icon: 'fas fa-laugh', + icon: 'ph-smiley', text: i18n.ts.customEmojis, to: '/admin/emojis', active: props.initialPage === 'emojis', }, { - icon: 'fas fa-globe', + icon: 'ph-globe', text: i18n.ts.federation, to: '/admin/federation', active: props.initialPage === 'federation', @@ -111,12 +111,12 @@ const menuDef = $computed(() => [{ to: '/admin/queue', active: props.initialPage === 'queue', }, { - icon: 'fas fa-cloud', + icon: 'ph-cloud', text: i18n.ts.files, to: '/admin/files', active: props.initialPage === 'files', }, { - icon: 'fas fa-broadcast-tower', + icon: 'ph-megaphone', text: i18n.ts.announcements, to: '/admin/announcements', active: props.initialPage === 'announcements', @@ -134,27 +134,27 @@ const menuDef = $computed(() => [{ }, { title: i18n.ts.settings, items: [{ - icon: 'fas fa-cog', + icon: 'ph-gear', text: i18n.ts.general, to: '/admin/settings', active: props.initialPage === 'settings', }, { - icon: 'fas fa-envelope', + icon: 'ph-envelope-simple', text: i18n.ts.emailServer, to: '/admin/email-settings', active: props.initialPage === 'email-settings', }, { - icon: 'fas fa-cloud', + icon: 'ph-cloud', text: i18n.ts.objectStorage, to: '/admin/object-storage', active: props.initialPage === 'object-storage', }, { - icon: 'fas fa-lock', + icon: 'ph-lock', text: i18n.ts.security, to: '/admin/security', active: props.initialPage === 'security', }, { - icon: 'fas fa-globe', + icon: 'ph-globe', text: i18n.ts.relays, to: '/admin/relays', active: props.initialPage === 'relays', @@ -174,7 +174,7 @@ const menuDef = $computed(() => [{ to: '/admin/proxy-account', active: props.initialPage === 'proxy-account', }, { - icon: 'fas fa-cogs', + icon: 'ph-gears', text: i18n.ts.other, to: '/admin/other-settings', active: props.initialPage === 'other-settings', @@ -282,19 +282,19 @@ const lookup = (ev) => { } }, { text: i18n.ts.note, - icon: 'fas fa-pencil-alt', + icon: 'ph-pencil', action: () => { alert('TODO'); } }, { text: i18n.ts.file, - icon: 'fas fa-cloud', + icon: 'ph-cloud', action: () => { alert('TODO'); } }, { text: i18n.ts.instance, - icon: 'fas fa-globe', + icon: 'ph-globe', action: () => { alert('TODO'); } diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue index d109db9c3..f6b40b490 100644 --- a/packages/client/src/pages/admin/object-storage.vue +++ b/packages/client/src/pages/admin/object-storage.vue @@ -132,11 +132,11 @@ function save() { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.objectStorage, - icon: 'fas fa-cloud', + icon: 'ph-cloud', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-check', + icon: 'ph-check', text: i18n.ts.save, handler: save, }], diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue index 552b05f34..930885d8d 100644 --- a/packages/client/src/pages/admin/other-settings.vue +++ b/packages/client/src/pages/admin/other-settings.vue @@ -27,11 +27,11 @@ function save() { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.other, - icon: 'fas fa-cogs', + icon: 'ph-gears', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-check', + icon: 'ph-check', text: i18n.ts.save, handler: save, }], diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue index cc69424c3..b535378e0 100644 --- a/packages/client/src/pages/admin/overview.vue +++ b/packages/client/src/pages/admin/overview.vue @@ -38,7 +38,7 @@ - +
Misskey
diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue index 656b18199..b6006b8a7 100644 --- a/packages/client/src/pages/admin/queue.vue +++ b/packages/client/src/pages/admin/queue.vue @@ -6,7 +6,7 @@ - {{ i18n.ts.clearQueue }} + {{ i18n.ts.clearQueue }} diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue index 1a36bb475..cc3d3dd1b 100644 --- a/packages/client/src/pages/admin/relays.vue +++ b/packages/client/src/pages/admin/relays.vue @@ -3,12 +3,12 @@
{{ relay.inbox }}
- + {{ $t(`_relayStatus.${relay.status}`) }}
- {{ i18n.ts.remove }} + {{ i18n.ts.remove }}
@@ -65,11 +65,11 @@ refresh(); defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.relays, - icon: 'fas fa-globe', + icon: 'ph-globe', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.addRelay, handler: addRelay, }], diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue index 6b8f70cca..38b0e2bd1 100644 --- a/packages/client/src/pages/admin/security.vue +++ b/packages/client/src/pages/admin/security.vue @@ -17,7 +17,7 @@
- + @@ -66,7 +66,7 @@ function save() { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.security, - icon: 'fas fa-lock', + icon: 'ph-lock', bg: 'var(--bg)', } }); diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index 6dc30fe50..bd0d981bf 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -11,7 +11,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -51,17 +51,17 @@ - + - + - + @@ -243,11 +243,11 @@ function save() { defineExpose({ [symbols.PAGE_INFO]: { title: i18n.ts.general, - icon: 'fas fa-cog', + icon: 'ph-gear', bg: 'var(--bg)', actions: [{ asFullButton: true, - icon: 'fas fa-check', + icon: 'ph-check', text: i18n.ts.save, handler: save, }], diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue index f05aa5ff4..f97ddd16d 100644 --- a/packages/client/src/pages/admin/users.vue +++ b/packages/client/src/pages/admin/users.vue @@ -125,20 +125,20 @@ function show(user) { defineExpose({ [symbols.PAGE_INFO]: computed(() => ({ title: i18n.ts.users, - icon: 'fas fa-users', + icon: 'ph-users-three', bg: 'var(--bg)', actions: [{ - icon: 'fas fa-search', + icon: 'ph-magnifying-glass', text: i18n.ts.search, handler: searchUser }, { asFullButton: true, - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.addUser, handler: addUser }, { asFullButton: true, - icon: 'fas fa-search', + icon: 'ph-magnifying-glass', text: i18n.ts.lookup, handler: lookupUser }], diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue index 53727823a..5e5a8aa38 100644 --- a/packages/client/src/pages/announcements.vue +++ b/packages/client/src/pages/announcements.vue @@ -8,7 +8,7 @@
- {{ $ts.gotIt }} + {{ $ts.gotIt }}
@@ -32,7 +32,7 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: { title: this.$ts.announcements, - icon: 'fas fa-broadcast-tower', + icon: 'ph-megaphone', bg: 'var(--bg)', }, pagination: { diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue index c38f28572..d25bf2c17 100644 --- a/packages/client/src/pages/antenna-timeline.vue +++ b/packages/client/src/pages/antenna-timeline.vue @@ -38,14 +38,14 @@ export default defineComponent({ queue: 0, [symbols.PAGE_INFO]: computed(() => this.antenna ? { title: this.antenna.name, - icon: 'fas fa-satellite', + icon: 'ph-cell-signal-full', bg: 'var(--bg)', actions: [{ icon: 'fas fa-calendar-alt', text: this.$ts.jumpToSpecifiedDate, handler: this.timetravel }, { - icon: 'fas fa-cog', + icon: 'ph-gear', text: this.$ts.settings, handler: this.settings }], diff --git a/packages/client/src/pages/api-console.vue b/packages/client/src/pages/api-console.vue index 88acbcd3a..df3919c7b 100644 --- a/packages/client/src/pages/api-console.vue +++ b/packages/client/src/pages/api-console.vue @@ -78,7 +78,7 @@ function onEndpointChange() { defineExpose({ [symbols.PAGE_INFO]: { title: 'API console', - icon: 'fas fa-terminal' + icon: 'ph-terminal' }, }); diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue index ea3a5dab7..bb3ec9a8d 100644 --- a/packages/client/src/pages/channel-editor.vue +++ b/packages/client/src/pages/channel-editor.vue @@ -10,10 +10,10 @@
@@ -48,11 +48,11 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: computed(() => this.channelId ? { title: this.$ts._channel.edit, - icon: 'fas fa-satellite-dish', + icon: 'ph-television', bg: 'var(--bg)', } : { title: this.$ts._channel.create, - icon: 'fas fa-satellite-dish', + icon: 'ph-television', bg: 'var(--bg)', }), channel: null, diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue index c9a8f3684..62f8de9e0 100644 --- a/packages/client/src/pages/channel.vue +++ b/packages/client/src/pages/channel.vue @@ -4,15 +4,15 @@
- + @@ -34,17 +34,17 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: computed(() => ({ title: this.$ts.channel, - icon: 'fas fa-satellite-dish', + icon: 'ph-television', bg: 'var(--bg)', actions: [{ - icon: 'fas fa-plus', + icon: 'ph-plus', text: this.$ts.create, handler: this.create, }], tabs: [{ active: this.tab === 'featured', title: this.$ts._channel.featured, - icon: 'fas fa-fire-alt', + icon: 'ph-fire', onClick: () => { this.tab = 'featured'; }, }, { active: this.tab === 'following', diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue index c999f1bfc..eec9fcd84 100644 --- a/packages/client/src/pages/clip.vue +++ b/packages/client/src/pages/clip.vue @@ -41,7 +41,7 @@ export default defineComponent({ return { [symbols.PAGE_INFO]: computed(() => this.clip ? { title: this.clip.name, - icon: 'fas fa-paperclip', + icon: 'ph-paperclip', bg: 'var(--bg)', actions: [{ icon: 'fas fa-ellipsis-h', @@ -83,7 +83,7 @@ export default defineComponent({ methods: { menu(ev) { os.popupMenu([this.isOwned ? { - icon: 'fas fa-pencil-alt', + icon: 'ph-pencil', text: this.$ts.edit, action: async () => { const { canceled, result } = await os.form(this.clip.name, { @@ -113,7 +113,7 @@ export default defineComponent({ }); } } : undefined, this.isOwned ? { - icon: 'fas fa-trash-alt', + icon: 'ph-trash', text: this.$ts.delete, danger: true, action: async () => { diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue index 68777bb08..e6947d6c2 100644 --- a/packages/client/src/pages/drive.vue +++ b/packages/client/src/pages/drive.vue @@ -16,7 +16,7 @@ let folder = $ref(null); defineExpose({ [symbols.PAGE_INFO]: computed(() => ({ title: folder ? folder.name : i18n.ts.drive, - icon: 'fas fa-cloud', + icon: 'ph-cloud', bg: 'var(--bg)', hideHeader: true, })), diff --git a/packages/client/src/pages/emojis.category.vue b/packages/client/src/pages/emojis.category.vue index c47870f4d..e4d6a49b7 100644 --- a/packages/client/src/pages/emojis.category.vue +++ b/packages/client/src/pages/emojis.category.vue @@ -2,7 +2,7 @@
- + - - + +
@@ -21,7 +21,7 @@ - +
@@ -38,7 +38,7 @@ - +
@@ -48,15 +48,15 @@
-
{{ $ts.location }}
+
{{ $ts.location }}
{{ user.location }}
-
{{ $ts.birthday }}
+
{{ $ts.birthday }}
{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ $t('yearsOld', { age }) }})
-
{{ $ts.registeredDate }}
+
{{ $ts.registeredDate }}
{{ new Date(user.createdAt).toLocaleString() }} ()
@@ -195,22 +195,22 @@ export default defineComponent({ }, ...(this.$i && (this.$i.id === this.user.id)) || this.user.publicReactions ? [{ active: this.page === 'reactions', title: this.$ts.reaction, - icon: 'fas fa-laugh', + icon: 'ph-smiley', onClick: () => { this.mkNav.push('/@' + getAcct(this.user) + '/reactions'); }, }] : [], { active: this.page === 'clips', title: this.$ts.clips, - icon: 'fas fa-paperclip', + icon: 'ph-paperclip', onClick: () => { this.mkNav.push('/@' + getAcct(this.user) + '/clips'); }, }, { active: this.page === 'pages', title: this.$ts.pages, - icon: 'fas fa-file-alt', + icon: 'ph-file-text', onClick: () => { this.mkNav.push('/@' + getAcct(this.user) + '/pages'); }, }, { active: this.page === 'gallery', title: this.$ts.gallery, - icon: 'fas fa-icons', + icon: 'ph-image', onClick: () => { this.mkNav.push('/@' + getAcct(this.user) + '/gallery'); }, }], } : null), diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 47e1f1234..54a42beea 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -119,19 +119,19 @@ export default defineComponent({ showMenu(ev) { os.popupMenu([{ text: this.$t('aboutX', { x: instanceName }), - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about'); } }, { text: this.$ts.aboutMisskey, - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about-misskey'); } }, null, { text: this.$ts.help, - icon: 'fas fa-question-circle', + icon: 'ph-question', action: () => { window.open(`https://misskey-hub.net/help.md`, '_blank'); } diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue index 053087fda..13a2fdc1c 100644 --- a/packages/client/src/pages/welcome.entrance.b.vue +++ b/packages/client/src/pages/welcome.entrance.b.vue @@ -103,19 +103,19 @@ export default defineComponent({ showMenu(ev) { os.popupMenu([{ text: this.$t('aboutX', { x: instanceName }), - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about'); } }, { text: this.$ts.aboutMisskey, - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about-misskey'); } }, null, { text: this.$ts.help, - icon: 'fas fa-question-circle', + icon: 'ph-question', action: () => { window.open(`https://misskey-hub.net/help.md`, '_blank'); } diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index 6bf487e16..9a51bded7 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -123,19 +123,19 @@ export default defineComponent({ showMenu(ev) { os.popupMenu([{ text: this.$t('aboutX', { x: instanceName }), - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about'); } }, { text: this.$ts.aboutMisskey, - icon: 'fas fa-info-circle', + icon: 'ph-info', action: () => { os.pageWindow('/about-misskey'); } }, null, { text: this.$ts.help, - icon: 'fas fa-question-circle', + icon: 'ph-question', action: () => { window.open(`https://misskey-hub.net/help.md`, '_blank'); } diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue index 1a2f46028..bb0d6f82f 100644 --- a/packages/client/src/pages/welcome.setup.vue +++ b/packages/client/src/pages/welcome.setup.vue @@ -10,7 +10,7 @@ - +
diff --git a/packages/client/src/pages/welcome.timeline.vue b/packages/client/src/pages/welcome.timeline.vue index bec9481ff..44ac947b6 100644 --- a/packages/client/src/pages/welcome.timeline.vue +++ b/packages/client/src/pages/welcome.timeline.vue @@ -4,7 +4,7 @@
- + RN: ...
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index 78749ad6b..bf34d101c 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -96,7 +96,7 @@ export function getNoteMenu(props: { async function clip(): Promise { const clips = await os.api('clips/list'); os.popupMenu([{ - icon: 'fas fa-plus', + icon: 'ph-plus', text: i18n.ts.createNew, action: async () => { const { canceled, result } = await os.form(i18n.ts.createNewClip, { @@ -174,7 +174,7 @@ export function getNoteMenu(props: { text: i18n.ts.copyContent, action: copyContent }, { - icon: 'fas fa-link', + icon: 'ph-link', text: i18n.ts.copyLink, action: copyLink }, (appearNote.url || appearNote.uri) ? { @@ -196,25 +196,25 @@ export function getNoteMenu(props: { } : undefined, null, statePromise.then(state => state.isFavorited ? { - icon: 'fas fa-star', + icon: 'ph-star', text: i18n.ts.unfavorite, action: () => toggleFavorite(false) } : { - icon: 'fas fa-star', + icon: 'ph-star', text: i18n.ts.favorite, action: () => toggleFavorite(true) }), { - icon: 'fas fa-paperclip', + icon: 'ph-paperclip', text: i18n.ts.clip, action: () => clip() }, (appearNote.userId !== $i.id) ? statePromise.then(state => state.isWatching ? { - icon: 'fas fa-eye-slash', + icon: 'ph-eye-slash', text: i18n.ts.unwatch, action: () => toggleWatch(false) } : { - icon: 'fas fa-eye', + icon: 'ph-eye', text: i18n.ts.watch, action: () => toggleWatch(true) }) : undefined, @@ -269,7 +269,7 @@ export function getNoteMenu(props: { action: delEdit } : undefined, { - icon: 'fas fa-trash-alt', + icon: 'ph-trash', text: i18n.ts.delete, danger: true, action: del @@ -283,7 +283,7 @@ export function getNoteMenu(props: { text: i18n.ts.copyContent, action: copyContent }, { - icon: 'fas fa-link', + icon: 'ph-link', text: i18n.ts.copyLink, action: copyLink }, (appearNote.url || appearNote.uri) ? { diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts index 091338efd..f08283493 100644 --- a/packages/client/src/scripts/get-user-menu.ts +++ b/packages/client/src/scripts/get-user-menu.ts @@ -152,41 +152,41 @@ export function getUserMenu(user) { } let menu = [{ - icon: 'fas fa-at', + icon: 'ph-at', text: i18n.ts.copyUsername, action: () => { copyToClipboard(`@${user.username}@${user.host || host}`); } }, { - icon: 'fas fa-info-circle', + icon: 'ph-info', text: i18n.ts.info, action: () => { os.pageWindow(`/user-info/${user.id}`); } }, { - icon: 'fas fa-envelope', + icon: 'ph-envelope-simple', text: i18n.ts.sendMessage, action: () => { os.post({ specified: user }); } }, meId !== user.id ? { type: 'link', - icon: 'fas fa-comments', + icon: 'ph-chats-circle', text: i18n.ts.startMessaging, to: '/my/messaging/' + Acct.toString(user), } : undefined, null, { - icon: 'fas fa-list-ul', + icon: 'ph-list-bullets', text: i18n.ts.addToList, action: pushList }, meId !== user.id ? { - icon: 'fas fa-users', + icon: 'ph-users-three', text: i18n.ts.inviteToGroup, action: inviteGroup } : undefined] as any; if ($i && meId !== user.id) { menu = menu.concat([null, { - icon: user.isMuted ? 'fas fa-eye' : 'fas fa-eye-slash', + icon: user.isMuted ? 'ph-eye' : 'ph-eye-slash', text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute, action: toggleMute }, { @@ -224,7 +224,7 @@ export function getUserMenu(user) { if ($i && meId === user.id) { menu = menu.concat([null, { - icon: 'fas fa-pencil-alt', + icon: 'ph-pencil', text: i18n.ts.editProfile, action: () => { router.push('/settings/profile'); diff --git a/packages/client/src/scripts/hpml/index.ts b/packages/client/src/scripts/hpml/index.ts index ac81eac2d..2b1d8be93 100644 --- a/packages/client/src/scripts/hpml/index.ts +++ b/packages/client/src/scripts/hpml/index.ts @@ -14,7 +14,7 @@ export type Fn = { export type Type = 'string' | 'number' | 'boolean' | 'stringArray' | null; export const literalDefs: Record = { - text: { out: 'string', category: 'value', icon: 'fas fa-quote-right', }, + text: { out: 'string', category: 'value', icon: 'ph-quotesright', }, multiLineText: { out: 'string', category: 'value', icon: 'fas fa-align-left', }, textList: { out: 'stringArray', category: 'value', icon: 'fas fa-list', }, number: { out: 'number', category: 'value', icon: 'fas fa-sort-numeric-up', }, diff --git a/packages/client/src/scripts/hpml/lib.ts b/packages/client/src/scripts/hpml/lib.ts index 01a44ffcd..f2beb52d7 100644 --- a/packages/client/src/scripts/hpml/lib.ts +++ b/packages/client/src/scripts/hpml/lib.ts @@ -135,7 +135,7 @@ export const funcDefs: Record - {{ $ts.timeline }} + {{ $ts.timeline }}
- {{ $ts.controlPanel }} + {{ $ts.controlPanel }} - {{ $ts.settings }} + {{ $ts.settings }}
diff --git a/packages/client/src/ui/_common_/sidebar.vue b/packages/client/src/ui/_common_/sidebar.vue index d65e776d8..aec2131f6 100644 --- a/packages/client/src/ui/_common_/sidebar.vue +++ b/packages/client/src/ui/_common_/sidebar.vue @@ -5,28 +5,28 @@ - {{ $ts.timeline }} + {{ $ts.timeline }}
- {{ $ts.controlPanel }} + {{ $ts.controlPanel }} - {{ $ts.settings }} + {{ $ts.settings }}
diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue index 57008aeae..fc85e3401 100644 --- a/packages/client/src/ui/classic.header.vue +++ b/packages/client/src/ui/classic.header.vue @@ -3,34 +3,34 @@
- +
- +
- +
- +
diff --git a/packages/client/src/ui/classic.side.vue b/packages/client/src/ui/classic.side.vue index 6c2329194..e9a11ee7e 100644 --- a/packages/client/src/ui/classic.side.vue +++ b/packages/client/src/ui/classic.side.vue @@ -70,7 +70,7 @@ function onContextmenu(ev: MouseEvent) { close(); } }, { - icon: 'fas fa-window-maximize', + icon: 'ph-frame-corners', text: i18n.ts.openInWindow, action: () => { if (path) os.pageWindow(path); @@ -84,7 +84,7 @@ function onContextmenu(ev: MouseEvent) { close(); } }, { - icon: 'fas fa-link', + icon: 'ph-link', text: i18n.ts.copyLink, action: () => { copyToClipboard(url); diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue index 6c0ce023e..a90614142 100644 --- a/packages/client/src/ui/classic.sidebar.vue +++ b/packages/client/src/ui/classic.sidebar.vue @@ -5,30 +5,30 @@
- {{ $ts.note }} + {{ $ts.note }}
- {{ $ts.timeline }} + {{ $ts.timeline }}
- {{ $ts.controlPanel }} + {{ $ts.controlPanel }} - {{ $ts.settings }} + {{ $ts.settings }}
diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue index c61cbc433..70a109321 100644 --- a/packages/client/src/ui/classic.vue +++ b/packages/client/src/ui/classic.vue @@ -188,7 +188,7 @@ export default defineComponent({ this.fullView = !this.fullView; } }, { - icon: 'fas fa-window-maximize', + icon: 'ph-frame-corners', text: this.$ts.openInWindow, action: () => { os.pageWindow(path); diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue index 6f9d18bde..650ea0362 100644 --- a/packages/client/src/ui/classic.widgets.vue +++ b/packages/client/src/ui/classic.widgets.vue @@ -3,8 +3,8 @@ - - + +
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue index e538a93f0..c9a16d0a3 100644 --- a/packages/client/src/ui/deck.vue +++ b/packages/client/src/ui/deck.vue @@ -26,8 +26,8 @@
- - + +
diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue index f12f5c6b2..e878201ed 100644 --- a/packages/client/src/ui/deck/antenna-column.vue +++ b/packages/client/src/ui/deck/antenna-column.vue @@ -1,7 +1,7 @@ - diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue index dc98a610b..1a2078448 100644 --- a/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue +++ b/packages/client/src/pages/page-editor/els/page-editor.el.counter.vue @@ -18,31 +18,17 @@ - diff --git a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue index be3a520ea..d763070b1 100644 --- a/packages/client/src/pages/page-editor/els/page-editor.el.if.vue +++ b/packages/client/src/pages/page-editor/els/page-editor.el.if.vue @@ -25,54 +25,39 @@ - diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue new file mode 100644 index 000000000..c01631c6a --- /dev/null +++ b/packages/client/src/components/global/page-header.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/packages/client/src/components/global/router-view.vue b/packages/client/src/components/global/router-view.vue new file mode 100644 index 000000000..393ba30c3 --- /dev/null +++ b/packages/client/src/components/global/router-view.vue @@ -0,0 +1,39 @@ + + + diff --git a/packages/client/src/components/index.ts b/packages/client/src/components/index.ts index 26bac6324..aa8a591e5 100644 --- a/packages/client/src/components/index.ts +++ b/packages/client/src/components/index.ts @@ -10,15 +10,17 @@ import MkEllipsis from './global/ellipsis.vue'; import MkTime from './global/time.vue'; import MkUrl from './global/url.vue'; import I18n from './global/i18n'; +import RouterView from './global/router-view.vue'; import MkLoading from './global/loading.vue'; import MkError from './global/error.vue'; import MkAd from './global/ad.vue'; -import MkHeader from './global/header.vue'; +import MkPageHeader from './global/page-header.vue'; import MkSpacer from './global/spacer.vue'; import MkStickyContainer from './global/sticky-container.vue'; export default function(app: App) { app.component('I18n', I18n); + app.component('RouterView', RouterView); app.component('Mfm', Mfm); app.component('MkA', MkA); app.component('MkAcct', MkAcct); @@ -31,7 +33,7 @@ export default function(app: App) { app.component('MkLoading', MkLoading); app.component('MkError', MkError); app.component('MkAd', MkAd); - app.component('MkHeader', MkHeader); + app.component('MkPageHeader', MkPageHeader); app.component('MkSpacer', MkSpacer); app.component('MkStickyContainer', MkStickyContainer); } @@ -39,6 +41,7 @@ export default function(app: App) { declare module '@vue/runtime-core' { export interface GlobalComponents { I18n: typeof I18n; + RouterView: typeof RouterView; Mfm: typeof Mfm; MkA: typeof MkA; MkAcct: typeof MkAcct; @@ -51,7 +54,7 @@ declare module '@vue/runtime-core' { MkLoading: typeof MkLoading; MkError: typeof MkError; MkAd: typeof MkAd; - MkHeader: typeof MkHeader; + MkPageHeader: typeof MkPageHeader; MkSpacer: typeof MkSpacer; MkStickyContainer: typeof MkStickyContainer; } diff --git a/packages/client/src/components/modal-page-window.vue b/packages/client/src/components/modal-page-window.vue index 21bdb657b..aef70f113 100644 --- a/packages/client/src/components/modal-page-window.vue +++ b/packages/client/src/components/modal-page-window.vue @@ -1,163 +1,118 @@ - diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue index e1d0361c0..2b6dadf7c 100644 --- a/packages/client/src/pages/admin/abuses.vue +++ b/packages/client/src/pages/admin/abuses.vue @@ -1,28 +1,31 @@ diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue index b18e08db9..05557469e 100644 --- a/packages/client/src/pages/admin/ads.vue +++ b/packages/client/src/pages/admin/ads.vue @@ -1,21 +1,23 @@ diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue index 97774975d..025897d09 100644 --- a/packages/client/src/pages/admin/announcements.vue +++ b/packages/client/src/pages/admin/announcements.vue @@ -1,34 +1,40 @@ diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue index 30fee5015..d2e7919b4 100644 --- a/packages/client/src/pages/admin/bot-protection.vue +++ b/packages/client/src/pages/admin/bot-protection.vue @@ -51,7 +51,6 @@ import FormButton from '@/components/ui/button.vue'; import FormSuspense from '@/components/form/suspense.vue'; import FormSlot from '@/components/form/slot.vue'; import * as os from '@/os'; -import * as symbols from '@/symbols'; import { fetchInstance } from '@/instance'; const MkCaptcha = defineAsyncComponent(() => import('@/components/captcha.vue')); diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue index d3519922b..b9c5f9e39 100644 --- a/packages/client/src/pages/admin/database.vue +++ b/packages/client/src/pages/admin/database.vue @@ -1,12 +1,13 @@ -