From ded0f6f0dfd68f448d3026163c76d9fcb83eb4f9 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 2 Jul 2022 14:00:37 +0900 Subject: [PATCH] refactor(client): refactoring --- .../client/src/components/page-window.vue | 1 + packages/client/src/pages/about-misskey.vue | 1 - packages/client/src/pages/about.vue | 1 - packages/client/src/pages/admin-file.vue | 1 - packages/client/src/pages/admin/abuses.vue | 1 - packages/client/src/pages/admin/ads.vue | 1 - .../client/src/pages/admin/announcements.vue | 1 - packages/client/src/pages/admin/database.vue | 1 - .../client/src/pages/admin/email-settings.vue | 1 - packages/client/src/pages/admin/emojis.vue | 1 - packages/client/src/pages/admin/files.vue | 1 - packages/client/src/pages/admin/index.vue | 1 - .../client/src/pages/admin/instance-block.vue | 1 - .../client/src/pages/admin/integrations.vue | 1 - .../client/src/pages/admin/object-storage.vue | 1 - .../client/src/pages/admin/other-settings.vue | 1 - packages/client/src/pages/admin/overview.vue | 1 - .../client/src/pages/admin/proxy-account.vue | 1 - packages/client/src/pages/admin/queue.vue | 1 - packages/client/src/pages/admin/relays.vue | 1 - packages/client/src/pages/admin/security.vue | 1 - packages/client/src/pages/admin/settings.vue | 1 - packages/client/src/pages/admin/users.vue | 1 - packages/client/src/pages/announcements.vue | 1 - .../client/src/pages/antenna-timeline.vue | 47 ++++++++++--------- packages/client/src/pages/channel-editor.vue | 2 - packages/client/src/pages/channel.vue | 1 - packages/client/src/pages/channels.vue | 1 - packages/client/src/pages/clip.vue | 1 - packages/client/src/pages/drive.vue | 1 - packages/client/src/pages/explore.vue | 1 - packages/client/src/pages/favorites.vue | 1 - packages/client/src/pages/follow-requests.vue | 1 - packages/client/src/pages/gallery/edit.vue | 2 - packages/client/src/pages/gallery/index.vue | 1 - packages/client/src/pages/gallery/post.vue | 1 - packages/client/src/pages/instance-info.vue | 1 - packages/client/src/pages/messaging/index.vue | 1 - .../client/src/pages/my-antennas/create.vue | 1 - .../client/src/pages/my-antennas/index.vue | 1 - packages/client/src/pages/my-clips/index.vue | 1 - packages/client/src/pages/my-lists/index.vue | 1 - packages/client/src/pages/my-lists/list.vue | 1 - packages/client/src/pages/not-found.vue | 1 - packages/client/src/pages/note.vue | 1 - packages/client/src/pages/notifications.vue | 1 - .../src/pages/page-editor/page-editor.vue | 3 +- packages/client/src/pages/pages.vue | 1 - packages/client/src/pages/preview.vue | 1 - packages/client/src/pages/reset-password.vue | 1 - packages/client/src/pages/search.vue | 1 - .../client/src/pages/settings/accounts.vue | 1 - packages/client/src/pages/settings/api.vue | 1 - packages/client/src/pages/settings/apps.vue | 1 - .../client/src/pages/settings/custom-css.vue | 1 - packages/client/src/pages/settings/deck.vue | 1 - .../src/pages/settings/delete-account.vue | 1 - packages/client/src/pages/settings/drive.vue | 1 - packages/client/src/pages/settings/email.vue | 1 - .../client/src/pages/settings/general.vue | 1 - .../src/pages/settings/import-export.vue | 1 - packages/client/src/pages/settings/index.vue | 1 - .../client/src/pages/settings/integration.vue | 1 - packages/client/src/pages/settings/menu.vue | 1 - .../client/src/pages/settings/mute-block.vue | 1 - .../src/pages/settings/notifications.vue | 1 - packages/client/src/pages/settings/other.vue | 1 - .../src/pages/settings/plugin.install.vue | 1 - packages/client/src/pages/settings/plugin.vue | 1 - .../client/src/pages/settings/privacy.vue | 1 - .../client/src/pages/settings/profile.vue | 1 - .../client/src/pages/settings/reaction.vue | 1 - .../client/src/pages/settings/security.vue | 1 - packages/client/src/pages/settings/sounds.vue | 1 - .../src/pages/settings/theme.install.vue | 1 - .../src/pages/settings/theme.manage.vue | 1 - packages/client/src/pages/settings/theme.vue | 1 - .../src/pages/settings/webhook.edit.vue | 1 - .../client/src/pages/settings/webhook.new.vue | 1 - .../client/src/pages/settings/webhook.vue | 1 - .../client/src/pages/settings/word-mute.vue | 1 - packages/client/src/pages/tag.vue | 1 - packages/client/src/pages/theme-editor.vue | 1 - packages/client/src/pages/timeline.vue | 1 - packages/client/src/pages/user-info.vue | 1 - .../client/src/pages/user-list-timeline.vue | 1 - packages/client/src/pages/user/followers.vue | 1 - packages/client/src/pages/user/following.vue | 1 - packages/client/src/pages/user/index.vue | 1 - packages/client/src/ui/universal.vue | 2 +- 90 files changed, 27 insertions(+), 114 deletions(-) diff --git a/packages/client/src/components/page-window.vue b/packages/client/src/components/page-window.vue index 886f480bfb..5b06c7718c 100644 --- a/packages/client/src/components/page-window.vue +++ b/packages/client/src/components/page-window.vue @@ -139,5 +139,6 @@ defineExpose({ diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue index ba85860cda..fd7b5f936d 100644 --- a/packages/client/src/pages/about-misskey.vue +++ b/packages/client/src/pages/about-misskey.vue @@ -204,7 +204,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.aboutMisskey, icon: null, - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index 683f7446b8..e482c4ca6d 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -131,7 +131,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.instanceInfo, icon: 'fas fa-info-circle', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue index 402e9502d2..7bfbed35f0 100644 --- a/packages/client/src/pages/admin-file.vue +++ b/packages/client/src/pages/admin-file.vue @@ -117,7 +117,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: file ? i18n.ts.file + ': ' + file.name : i18n.ts.file, icon: 'fas fa-file', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue index 2b6dadf7c6..59d457dde7 100644 --- a/packages/client/src/pages/admin/abuses.vue +++ b/packages/client/src/pages/admin/abuses.vue @@ -87,7 +87,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.abuseReports, icon: 'fas fa-exclamation-circle', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue index 05557469e7..21feafc0bb 100644 --- a/packages/client/src/pages/admin/ads.vue +++ b/packages/client/src/pages/admin/ads.vue @@ -116,7 +116,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.ads, icon: 'fas fa-audio-description', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue index 025897d093..5107c2f302 100644 --- a/packages/client/src/pages/admin/announcements.vue +++ b/packages/client/src/pages/admin/announcements.vue @@ -102,7 +102,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.announcements, icon: 'fas fa-broadcast-tower', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/database.vue b/packages/client/src/pages/admin/database.vue index b9c5f9e393..ca8718ef63 100644 --- a/packages/client/src/pages/admin/database.vue +++ b/packages/client/src/pages/admin/database.vue @@ -29,6 +29,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.database, icon: 'fas fa-database', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue index c0ff94fad2..46cfd3db72 100644 --- a/packages/client/src/pages/admin/email-settings.vue +++ b/packages/client/src/pages/admin/email-settings.vue @@ -122,6 +122,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.emailServer, icon: 'fas fa-envelope', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index 868472ac9c..4d847daa54 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -292,7 +292,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.customEmojis, icon: 'fas fa-laugh', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue index 1d037fc4e4..dd309180a7 100644 --- a/packages/client/src/pages/admin/files.vue +++ b/packages/client/src/pages/admin/files.vue @@ -110,7 +110,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.ts.files, icon: 'fas fa-cloud', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index d967a081b7..f0ac5b3fc9 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -41,7 +41,6 @@ const router = useRouter(); const indexInfo = { title: i18n.ts.controlPanel, icon: 'fas fa-cog', - bg: 'var(--bg)', hideHeader: true, }; diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue index 1aec151abb..6d479e8f0d 100644 --- a/packages/client/src/pages/admin/instance-block.vue +++ b/packages/client/src/pages/admin/instance-block.vue @@ -47,6 +47,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.instanceBlocking, icon: 'fas fa-ban', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/integrations.vue b/packages/client/src/pages/admin/integrations.vue index d407d440b9..9964426a68 100644 --- a/packages/client/src/pages/admin/integrations.vue +++ b/packages/client/src/pages/admin/integrations.vue @@ -53,6 +53,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.integration, icon: 'fas fa-share-alt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/object-storage.vue b/packages/client/src/pages/admin/object-storage.vue index 450fd134e1..5cc3018532 100644 --- a/packages/client/src/pages/admin/object-storage.vue +++ b/packages/client/src/pages/admin/object-storage.vue @@ -144,6 +144,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.objectStorage, icon: 'fas fa-cloud', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/other-settings.vue b/packages/client/src/pages/admin/other-settings.vue index 59b3503c3c..ee4e8edba0 100644 --- a/packages/client/src/pages/admin/other-settings.vue +++ b/packages/client/src/pages/admin/other-settings.vue @@ -40,6 +40,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.other, icon: 'fas fa-cogs', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue index f44bba27fd..316cf04f14 100644 --- a/packages/client/src/pages/admin/overview.vue +++ b/packages/client/src/pages/admin/overview.vue @@ -468,7 +468,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.dashboard, icon: 'fas fa-tachometer-alt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue index 0c5bb1bc9f..0951d26c24 100644 --- a/packages/client/src/pages/admin/proxy-account.vue +++ b/packages/client/src/pages/admin/proxy-account.vue @@ -58,6 +58,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.proxyAccount, icon: 'fas fa-ghost', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue index d091fe647c..6ccb464d17 100644 --- a/packages/client/src/pages/admin/queue.vue +++ b/packages/client/src/pages/admin/queue.vue @@ -52,6 +52,5 @@ const headerTabs = $computed(() => [{ definePageMetadata({ title: i18n.ts.jobQueue, icon: 'fas fa-clipboard-list', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue index 1ca4f2df09..42347c0e7d 100644 --- a/packages/client/src/pages/admin/relays.vue +++ b/packages/client/src/pages/admin/relays.vue @@ -78,7 +78,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.relays, icon: 'fas fa-globe', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue index 65b08565cd..ec11e42a7d 100644 --- a/packages/client/src/pages/admin/security.vue +++ b/packages/client/src/pages/admin/security.vue @@ -74,6 +74,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.security, icon: 'fas fa-lock', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index a5767cc2c2..496eb46ea4 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -258,6 +258,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.general, icon: 'fas fa-cog', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue index 3b70679a45..fc2ab3ea00 100644 --- a/packages/client/src/pages/admin/users.vue +++ b/packages/client/src/pages/admin/users.vue @@ -135,7 +135,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.ts.users, icon: 'fas fa-users', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue index 9afaa7fd1f..aeb85b6557 100644 --- a/packages/client/src/pages/announcements.vue +++ b/packages/client/src/pages/announcements.vue @@ -47,7 +47,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.announcements, icon: 'fas fa-broadcast-tower', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue index 29b6066fc9..831ced4eac 100644 --- a/packages/client/src/pages/antenna-timeline.vue +++ b/packages/client/src/pages/antenna-timeline.vue @@ -1,17 +1,20 @@ diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue index 2065bd6689..0fa1f69518 100644 --- a/packages/client/src/pages/channel-editor.vue +++ b/packages/client/src/pages/channel-editor.vue @@ -111,11 +111,9 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => props.channelId ? { title: i18n.ts._channel.edit, icon: 'fas fa-satellite-dish', - bg: 'var(--bg)', } : { title: i18n.ts._channel.create, icon: 'fas fa-satellite-dish', - bg: 'var(--bg)', })); diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue index 003ad5cce9..1443a9b644 100644 --- a/packages/client/src/pages/channel.vue +++ b/packages/client/src/pages/channel.vue @@ -80,7 +80,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => channel ? { title: channel.name, icon: 'fas fa-satellite-dish', - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index c48a64a1e7..63612bc57f 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -75,6 +75,5 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.channel, icon: 'fas fa-satellite-dish', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue index ce21b4c809..608e4ba7ee 100644 --- a/packages/client/src/pages/clip.vue +++ b/packages/client/src/pages/clip.vue @@ -102,7 +102,6 @@ const headerActions = $computed(() => clip && isOwned ? [{ definePageMetadata(computed(() => clip ? { title: clip.name, icon: 'fas fa-paperclip', - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/drive.vue b/packages/client/src/pages/drive.vue index c7bc31135c..988a1bf3df 100644 --- a/packages/client/src/pages/drive.vue +++ b/packages/client/src/pages/drive.vue @@ -20,7 +20,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: folder ? folder.name : i18n.ts.drive, icon: 'fas fa-cloud', - bg: 'var(--bg)', hideHeader: true, }))); diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue index c59fb639d4..981660cbfe 100644 --- a/packages/client/src/pages/explore.vue +++ b/packages/client/src/pages/explore.vue @@ -87,6 +87,5 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.explore, icon: 'fas fa-hashtag', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue index 6efca4c221..6f75d68def 100644 --- a/packages/client/src/pages/favorites.vue +++ b/packages/client/src/pages/favorites.vue @@ -38,7 +38,6 @@ const pagingComponent = ref>(); definePageMetadata({ title: i18n.ts.favorites, icon: 'fas fa-star', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue index e6f9a9a5d9..f21c68c4c7 100644 --- a/packages/client/src/pages/follow-requests.vue +++ b/packages/client/src/pages/follow-requests.vue @@ -65,7 +65,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.ts.followRequests, icon: 'fas fa-user-clock', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue index 1de8328fea..f8a5d54f71 100644 --- a/packages/client/src/pages/gallery/edit.vue +++ b/packages/client/src/pages/gallery/edit.vue @@ -116,11 +116,9 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => props.postId ? { title: i18n.ts.edit, icon: 'fas fa-pencil-alt', - bg: 'var(--bg)', } : { title: i18n.ts.postToGallery, icon: 'fas fa-pencil-alt', - bg: 'var(--bg)', })); diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue index 1eb6ce22f8..6b406af742 100644 --- a/packages/client/src/pages/gallery/index.vue +++ b/packages/client/src/pages/gallery/index.vue @@ -122,7 +122,6 @@ const headerTabs = $computed(() => [{ definePageMetadata({ title: i18n.ts.gallery, icon: 'fas fa-icons', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue index 6651c3e28f..e16ccc3150 100644 --- a/packages/client/src/pages/gallery/post.vue +++ b/packages/client/src/pages/gallery/post.vue @@ -149,7 +149,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => post ? { title: post.title, avatar: post.user, - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index 83f3354df1..b97ebb3e3d 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -215,7 +215,6 @@ const headerTabs = $computed(() => [{ definePageMetadata({ title: props.host, icon: 'fas fa-server', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index bf9ac056cf..7df4c846fb 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -159,7 +159,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.messaging, icon: 'fas fa-comments', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue index e792834a89..dc10bece81 100644 --- a/packages/client/src/pages/my-antennas/create.vue +++ b/packages/client/src/pages/my-antennas/create.vue @@ -38,7 +38,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageAntennas, icon: 'fas fa-satellite', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue index 2cdb26031f..70e444da52 100644 --- a/packages/client/src/pages/my-antennas/index.vue +++ b/packages/client/src/pages/my-antennas/index.vue @@ -34,7 +34,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageAntennas, icon: 'fas fa-satellite', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue index 6434b0c004..ac5a3578f8 100644 --- a/packages/client/src/pages/my-clips/index.vue +++ b/packages/client/src/pages/my-clips/index.vue @@ -69,7 +69,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.clip, icon: 'fas fa-paperclip', - bg: 'var(--bg)', action: { icon: 'fas fa-plus', handler: create, diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue index 411826a950..03b638151e 100644 --- a/packages/client/src/pages/my-lists/index.vue +++ b/packages/client/src/pages/my-lists/index.vue @@ -46,7 +46,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.manageLists, icon: 'fas fa-list-ul', - bg: 'var(--bg)', action: { icon: 'fas fa-plus', handler: create, diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue index 6e76c4a7d5..5bc0bf41dd 100644 --- a/packages/client/src/pages/my-lists/list.vue +++ b/packages/client/src/pages/my-lists/list.vue @@ -120,7 +120,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => list ? { title: list.name, icon: 'fas fa-list-ul', - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/not-found.vue b/packages/client/src/pages/not-found.vue index 955fbbccfd..a819cce961 100644 --- a/packages/client/src/pages/not-found.vue +++ b/packages/client/src/pages/not-found.vue @@ -18,6 +18,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.notFound, icon: 'fas fa-exclamation-triangle', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue index 852b821573..7c936cc629 100644 --- a/packages/client/src/pages/note.vue +++ b/packages/client/src/pages/note.vue @@ -132,7 +132,6 @@ definePageMetadata(computed(() => note ? { title: i18n.t('noteOf', { user: note.user.name }), text: note.text, }, - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue index 3df1a3f17f..acf338c2c2 100644 --- a/packages/client/src/pages/notifications.vue +++ b/packages/client/src/pages/notifications.vue @@ -91,6 +91,5 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.notifications, icon: 'fas fa-bell', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue index c38286c1d3..3ce48e89f4 100644 --- a/packages/client/src/pages/page-editor/page-editor.vue +++ b/packages/client/src/pages/page-editor/page-editor.vue @@ -439,8 +439,7 @@ definePageMetadata(computed(() => { return { title: title, icon: 'fas fa-pencil-alt', - bg: 'var(--bg)', - }; + }; })); diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue index 16aeae2f56..62c675e41e 100644 --- a/packages/client/src/pages/pages.vue +++ b/packages/client/src/pages/pages.vue @@ -77,7 +77,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.pages, icon: 'fas fa-sticky-note', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/preview.vue b/packages/client/src/pages/preview.vue index cba7589a38..8f211081dd 100644 --- a/packages/client/src/pages/preview.vue +++ b/packages/client/src/pages/preview.vue @@ -17,7 +17,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.ts.preview, icon: 'fas fa-eye', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue index 39a1191caf..10c41f2d21 100644 --- a/packages/client/src/pages/reset-password.vue +++ b/packages/client/src/pages/reset-password.vue @@ -51,7 +51,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.resetPassword, icon: 'fas fa-lock', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue index 25fef7af50..404b9e3dbd 100644 --- a/packages/client/src/pages/search.vue +++ b/packages/client/src/pages/search.vue @@ -34,6 +34,5 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.t('searchWith', { q: props.query }), icon: 'fas fa-search', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue index 47b816243f..d1e71c4548 100644 --- a/packages/client/src/pages/settings/accounts.vue +++ b/packages/client/src/pages/settings/accounts.vue @@ -109,7 +109,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.accounts, icon: 'fas fa-users', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue index d94862712e..b8a2dedb5a 100644 --- a/packages/client/src/pages/settings/api.vue +++ b/packages/client/src/pages/settings/api.vue @@ -42,6 +42,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: 'API', icon: 'fas fa-key', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue index 673e91fe6b..10ecbc795d 100644 --- a/packages/client/src/pages/settings/apps.vue +++ b/packages/client/src/pages/settings/apps.vue @@ -67,7 +67,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.installedApps, icon: 'fas fa-plug', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/custom-css.vue b/packages/client/src/pages/settings/custom-css.vue index 3e032be257..d5000d3973 100644 --- a/packages/client/src/pages/settings/custom-css.vue +++ b/packages/client/src/pages/settings/custom-css.vue @@ -42,6 +42,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.customCss, icon: 'fas fa-code', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/deck.vue b/packages/client/src/pages/settings/deck.vue index 295357377e..b1cf8a8cc9 100644 --- a/packages/client/src/pages/settings/deck.vue +++ b/packages/client/src/pages/settings/deck.vue @@ -73,6 +73,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.deck, icon: 'fas fa-columns', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/delete-account.vue b/packages/client/src/pages/settings/delete-account.vue index a587c32998..3c4ea716ce 100644 --- a/packages/client/src/pages/settings/delete-account.vue +++ b/packages/client/src/pages/settings/delete-account.vue @@ -48,6 +48,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._accountDelete.accountDelete, icon: 'fas fa-exclamation-triangle', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue index 73c0384f1f..cec2dc4d5f 100644 --- a/packages/client/src/pages/settings/drive.vue +++ b/packages/client/src/pages/settings/drive.vue @@ -101,7 +101,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.drive, icon: 'fas fa-cloud', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue index 8b67ff34dd..e575af6d6b 100644 --- a/packages/client/src/pages/settings/email.vue +++ b/packages/client/src/pages/settings/email.vue @@ -107,6 +107,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.email, icon: 'fas fa-envelope', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue index e7339af14e..74fa0bc926 100644 --- a/packages/client/src/pages/settings/general.vue +++ b/packages/client/src/pages/settings/general.vue @@ -186,6 +186,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.general, icon: 'fas fa-cogs', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue index 49d8a80b38..d48dab9f8d 100644 --- a/packages/client/src/pages/settings/import-export.vue +++ b/packages/client/src/pages/settings/import-export.vue @@ -155,7 +155,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.importAndExport, icon: 'fas fa-boxes', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 8143298cc5..8e445a77d7 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -42,7 +42,6 @@ const props = withDefaults(defineProps<{ const indexInfo = { title: i18n.ts.settings, icon: 'fas fa-cog', - bg: 'var(--bg)', hideHeader: true, }; const INFO = ref(indexInfo); diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue index 7de151040e..ccb02e08a2 100644 --- a/packages/client/src/pages/settings/integration.vue +++ b/packages/client/src/pages/settings/integration.vue @@ -95,6 +95,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.integration, icon: 'fas fa-share-alt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/menu.vue b/packages/client/src/pages/settings/menu.vue index 1b4d8799c8..076654c105 100644 --- a/packages/client/src/pages/settings/menu.vue +++ b/packages/client/src/pages/settings/menu.vue @@ -83,6 +83,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.menu, icon: 'fas fa-list-ul', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue index d8cb286626..397a0c815c 100644 --- a/packages/client/src/pages/settings/mute-block.vue +++ b/packages/client/src/pages/settings/mute-block.vue @@ -57,6 +57,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.muteAndBlock, icon: 'fas fa-ban', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue index 494a3eebe0..d2a363965a 100644 --- a/packages/client/src/pages/settings/notifications.vue +++ b/packages/client/src/pages/settings/notifications.vue @@ -56,6 +56,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.notifications, icon: 'fas fa-bell', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/other.vue b/packages/client/src/pages/settings/other.vue index 283d87a066..52ef4d401f 100644 --- a/packages/client/src/pages/settings/other.vue +++ b/packages/client/src/pages/settings/other.vue @@ -41,6 +41,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.other, icon: 'fas fa-ellipsis-h', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue index 7ff55e9d83..a4cab4b7a4 100644 --- a/packages/client/src/pages/settings/plugin.install.vue +++ b/packages/client/src/pages/settings/plugin.install.vue @@ -120,6 +120,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._plugin.install, icon: 'fas fa-download', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue index 75cf42bb89..8e773b7990 100644 --- a/packages/client/src/pages/settings/plugin.vue +++ b/packages/client/src/pages/settings/plugin.vue @@ -90,7 +90,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.plugins, icon: 'fas fa-plug', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue index 4d509efe28..be9e34cdfb 100644 --- a/packages/client/src/pages/settings/privacy.vue +++ b/packages/client/src/pages/settings/privacy.vue @@ -96,6 +96,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.privacy, icon: 'fas fa-lock-open', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue index b662de9e3d..6b60148df5 100644 --- a/packages/client/src/pages/settings/profile.vue +++ b/packages/client/src/pages/settings/profile.vue @@ -183,7 +183,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.profile, icon: 'fas fa-user', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue index d0fdf835cf..382e1b081e 100644 --- a/packages/client/src/pages/settings/reaction.vue +++ b/packages/client/src/pages/settings/reaction.vue @@ -131,7 +131,6 @@ definePageMetadata({ icon: 'fas fa-eye', handler: preview, }, - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue index 57880ef3dd..eb3efa9afb 100644 --- a/packages/client/src/pages/settings/security.vue +++ b/packages/client/src/pages/settings/security.vue @@ -104,7 +104,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.security, icon: 'fas fa-lock', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue index bb23257d7a..f29c9eb049 100644 --- a/packages/client/src/pages/settings/sounds.vue +++ b/packages/client/src/pages/settings/sounds.vue @@ -131,6 +131,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.sounds, icon: 'fas fa-music', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/theme.install.vue b/packages/client/src/pages/settings/theme.install.vue index 6a863ed9e6..2994d8fb1a 100644 --- a/packages/client/src/pages/settings/theme.install.vue +++ b/packages/client/src/pages/settings/theme.install.vue @@ -76,6 +76,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._theme.install, icon: 'fas fa-download', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/theme.manage.vue b/packages/client/src/pages/settings/theme.manage.vue index 68cbf3c353..9d28b4a316 100644 --- a/packages/client/src/pages/settings/theme.manage.vue +++ b/packages/client/src/pages/settings/theme.manage.vue @@ -74,6 +74,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._theme.manage, icon: 'fas fa-folder-open', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue index d4c23e07b0..6e7a5ff3a3 100644 --- a/packages/client/src/pages/settings/theme.vue +++ b/packages/client/src/pages/settings/theme.vue @@ -152,7 +152,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.theme, icon: 'fas fa-palette', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/webhook.edit.vue b/packages/client/src/pages/settings/webhook.edit.vue index d3cf5d7b79..618250958b 100644 --- a/packages/client/src/pages/settings/webhook.edit.vue +++ b/packages/client/src/pages/settings/webhook.edit.vue @@ -86,6 +86,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: 'Edit webhook', icon: 'fas fa-bolt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue index 508c0d78be..fa96c5fa4b 100644 --- a/packages/client/src/pages/settings/webhook.new.vue +++ b/packages/client/src/pages/settings/webhook.new.vue @@ -78,6 +78,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: 'Create new webhook', icon: 'fas fa-bolt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue index 50739e2fd1..ef9b9b56f7 100644 --- a/packages/client/src/pages/settings/webhook.vue +++ b/packages/client/src/pages/settings/webhook.vue @@ -49,6 +49,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: 'Webhook', icon: 'fas fa-bolt', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue index c6af0e7661..5fee7cd35a 100644 --- a/packages/client/src/pages/settings/word-mute.vue +++ b/packages/client/src/pages/settings/word-mute.vue @@ -124,6 +124,5 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.wordMute, icon: 'fas fa-comment-slash', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue index d63864ed5c..406eb1c988 100644 --- a/packages/client/src/pages/tag.vue +++ b/packages/client/src/pages/tag.vue @@ -28,6 +28,5 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: props.tag, icon: 'fas fa-hashtag', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index 3525543531..cec3833594 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -224,7 +224,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.themeEditor, icon: 'fas fa-palette', - bg: 'var(--bg)', }); diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 004c29c56b..40eb85ff43 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -151,7 +151,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.timeline, icon: src === 'local' ? 'fas fa-comments' : src === 'social' ? 'fas fa-share-alt' : src === 'global' ? 'fas fa-globe' : 'fas fa-home', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue index b3292290ea..cfea2637b7 100644 --- a/packages/client/src/pages/user-info.vue +++ b/packages/client/src/pages/user-info.vue @@ -309,7 +309,6 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: user ? acct(user) : i18n.ts.userInfo, icon: 'fas fa-info-circle', - bg: 'var(--bg)', }))); diff --git a/packages/client/src/pages/user-list-timeline.vue b/packages/client/src/pages/user-list-timeline.vue index 07d5a166e9..593db1dea7 100644 --- a/packages/client/src/pages/user-list-timeline.vue +++ b/packages/client/src/pages/user-list-timeline.vue @@ -79,7 +79,6 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => list ? { title: list.name, icon: 'fas fa-list-ul', - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/user/followers.vue b/packages/client/src/pages/user/followers.vue index 3feec15e4a..c0c0e01d7f 100644 --- a/packages/client/src/pages/user/followers.vue +++ b/packages/client/src/pages/user/followers.vue @@ -54,7 +54,6 @@ definePageMetadata(computed(() => user ? { subtitle: i18n.ts.followers, userName: user, avatar: user, - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/user/following.vue b/packages/client/src/pages/user/following.vue index 0c6bb1c9f4..d1753fe7d5 100644 --- a/packages/client/src/pages/user/following.vue +++ b/packages/client/src/pages/user/following.vue @@ -54,7 +54,6 @@ definePageMetadata(computed(() => user ? { subtitle: i18n.ts.following, userName: user, avatar: user, - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index bd1bb11a5b..99c3413882 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -103,7 +103,6 @@ definePageMetadata(computed(() => user ? { share: { title: user.name, }, - bg: 'var(--bg)', } : null)); diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 41d59342bd..3614f7de53 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -234,7 +234,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null; > .contents { width: 100%; min-width: 0; - background: var(--panel); + background: var(--bg); > main { min-width: 0;