From b675c66d703dcc0f3830b16588c47d317c396035 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sat, 22 Jun 2024 13:55:21 +0100
Subject: [PATCH] replaced another bunch, and some fixes
---
packages/frontend/src/components/MkMediaVideo.vue | 2 +-
packages/frontend/src/components/MkPasswordDialog.vue | 2 +-
packages/frontend/src/components/MkPostForm.vue | 2 +-
.../src/components/MkTutorialDialog.Timeline.vue | 2 +-
packages/frontend/src/pages/admin/index.vue | 6 +++---
packages/frontend/src/pages/admin/other-settings.vue | 2 +-
packages/frontend/src/pages/admin/proxy-account.vue | 2 +-
packages/frontend/src/pages/avatar-decorations.vue | 2 +-
packages/frontend/src/pages/registry.keys.vue | 2 +-
packages/frontend/src/pages/registry.value.vue | 2 +-
packages/frontend/src/pages/registry.vue | 2 +-
packages/frontend/src/pages/reversi/game.board.vue | 4 ++--
.../frontend/src/pages/settings/avatar-decoration.vue | 2 +-
packages/frontend/src/pages/settings/general.vue | 2 +-
packages/frontend/src/pages/settings/index.vue | 4 ++--
packages/frontend/src/pages/settings/other.vue | 2 +-
packages/frontend/src/pages/settings/privacy.vue | 2 +-
packages/frontend/src/pages/settings/profile.vue | 2 +-
packages/frontend/src/pages/timeline.vue | 4 ++--
packages/frontend/src/ui/_common_/common.ts | 2 +-
packages/frontend/src/widgets/WidgetTimeline.vue | 4 ++--
packages/frontend/vite.config.ts | 11 ++++++++++-
22 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index d22bec511c..4dc5059724 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -197,7 +197,7 @@ function showMenu(ev: MouseEvent) {
},
...(document.pictureInPictureEnabled ? [{
text: i18n.ts._mediaControls.pip,
- icon: 'ph ph-picture-in-picture',
+ icon: 'ti ti-picture-in-picture',
action: togglePictureInPicture,
}] : []),
{
diff --git a/packages/frontend/src/components/MkPasswordDialog.vue b/packages/frontend/src/components/MkPasswordDialog.vue
index 3cdf077626..e749725fea 100644
--- a/packages/frontend/src/components/MkPasswordDialog.vue
+++ b/packages/frontend/src/components/MkPasswordDialog.vue
@@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #caption><button class="_textButton" type="button" @click="isBackupCode = !isBackupCode">{{ isBackupCode ? i18n.ts.useTotp : i18n.ts.useBackupCode }}</button></template>
</MkInput>
- <MkButton :disabled="(password ?? '') == '' || ($i.twoFactorEnabled && (token ?? '') == '')" type="submit" primary rounded style="margin: 0 auto;"><i class="ph-lock ph-bold ph-lg-open"></i> {{ i18n.ts.continue }}</MkButton>
+ <MkButton :disabled="(password ?? '') == '' || ($i.twoFactorEnabled && (token ?? '') == '')" type="submit" primary rounded style="margin: 0 auto;"><i class="ti ti-lock-open"></i> {{ i18n.ts.continue }}</MkButton>
</div>
</form>
</MkSpacer>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 30f8765b0b..57ed0458aa 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -79,7 +79,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<footer :class="$style.footer">
<div :class="$style.footerLeft">
- <button v-tooltip="i18n.ts.attachFile" class="_button" :class="$style.footerButton" @click="chooseFileFrom"><i class="ph-image-square ph-bold ph-lg-plus"></i></button>
+ <button v-tooltip="i18n.ts.attachFile" class="_button" :class="$style.footerButton" @click="chooseFileFrom"><i class="ti ti-photo-plus"></i></button>
<button v-tooltip="i18n.ts.poll" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: poll }]" @click="togglePoll"><i class="ti ti-chart-arrows"></i></button>
<button v-tooltip="i18n.ts.useCw" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: useCw }]" @click="useCw = !useCw"><i class="ti ti-eye-off"></i></button>
<button v-tooltip="i18n.ts.mention" class="_button" :class="$style.footerButton" @click="insertMention"><i class="ti ti-at"></i></button>
diff --git a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
index a8aa44dea2..877c3c9eaa 100644
--- a/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
+++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_s">
<div><i class="ti ti-home"></i> <b>{{ i18n.ts._timelines.home }}</b> … {{ i18n.ts._initialTutorial._timeline.home }}</div>
<div><i class="ti ti-planet"></i> <b>{{ i18n.ts._timelines.local }}</b> … {{ i18n.ts._initialTutorial._timeline.local }}</div>
- <div><i class="ph-rocket-launch ph-bold ph-lg"></i> <b>{{ i18n.ts._timelines.social }}</b> … {{ i18n.ts._initialTutorial._timeline.social }}</div>
+ <div><i class="ti ti-universe"></i> <b>{{ i18n.ts._timelines.social }}</b> … {{ i18n.ts._initialTutorial._timeline.social }}</div>
<div><i class="ti ti-whirl"></i> <b>{{ i18n.ts._timelines.global }}</b> … {{ i18n.ts._initialTutorial._timeline.global }}</div>
</div>
<div class="_gaps_s">
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 32f671200c..7d03b857d2 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -137,7 +137,7 @@ const menuDef = computed(() => [{
to: '/admin/emojis',
active: currentPage.value?.route.name === 'emojis',
}, {
- icon: 'ph-sparkle ph-bold ph-lg',
+ icon: 'ti ti-sparkles',
text: i18n.ts.avatarDecorations,
to: '/admin/avatar-decorations',
active: currentPage.value?.route.name === 'avatarDecorations',
@@ -220,7 +220,7 @@ const menuDef = computed(() => [{
to: '/admin/instance-block',
active: currentPage.value?.route.name === 'instance-block',
}, {
- icon: 'ph-ghost ph-bold ph-lg',
+ icon: 'ti ti-ghost',
text: i18n.ts.proxyAccount,
to: '/admin/proxy-account',
active: currentPage.value?.route.name === 'proxy-account',
@@ -230,7 +230,7 @@ const menuDef = computed(() => [{
to: '/admin/external-services',
active: currentPage.value?.route.name === 'external-services',
}, {
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
text: i18n.ts.other,
to: '/admin/other-settings',
active: currentPage.value?.route.name === 'other-settings',
diff --git a/packages/frontend/src/pages/admin/other-settings.vue b/packages/frontend/src/pages/admin/other-settings.vue
index a920563748..a92034f2d7 100644
--- a/packages/frontend/src/pages/admin/other-settings.vue
+++ b/packages/frontend/src/pages/admin/other-settings.vue
@@ -108,6 +108,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.other,
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
}));
</script>
diff --git a/packages/frontend/src/pages/admin/proxy-account.vue b/packages/frontend/src/pages/admin/proxy-account.vue
index 59fd5911d4..81db9f1da9 100644
--- a/packages/frontend/src/pages/admin/proxy-account.vue
+++ b/packages/frontend/src/pages/admin/proxy-account.vue
@@ -66,6 +66,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.proxyAccount,
- icon: 'ph-ghost ph-bold ph-lg',
+ icon: 'ti ti-ghost',
}));
</script>
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
index dc1aba11ec..ad9ec3c4ee 100644
--- a/packages/frontend/src/pages/avatar-decorations.vue
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -96,6 +96,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.avatarDecorations,
- icon: 'ph-sparkle ph-bold ph-lg',
+ icon: 'ti ti-sparkles',
}));
</script>
diff --git a/packages/frontend/src/pages/registry.keys.vue b/packages/frontend/src/pages/registry.keys.vue
index 350c4fea1d..bac1d2bb70 100644
--- a/packages/frontend/src/pages/registry.keys.vue
+++ b/packages/frontend/src/pages/registry.keys.vue
@@ -98,6 +98,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.registry,
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
}));
</script>
diff --git a/packages/frontend/src/pages/registry.value.vue b/packages/frontend/src/pages/registry.value.vue
index 65c5ecda18..c40d13f664 100644
--- a/packages/frontend/src/pages/registry.value.vue
+++ b/packages/frontend/src/pages/registry.value.vue
@@ -125,6 +125,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.registry,
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
}));
</script>
diff --git a/packages/frontend/src/pages/registry.vue b/packages/frontend/src/pages/registry.vue
index de0c898187..c641874b17 100644
--- a/packages/frontend/src/pages/registry.vue
+++ b/packages/frontend/src/pages/registry.vue
@@ -75,6 +75,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.registry,
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
}));
</script>
diff --git a/packages/frontend/src/pages/reversi/game.board.vue b/packages/frontend/src/pages/reversi/game.board.vue
index 7cfce81f74..175ea62411 100644
--- a/packages/frontend/src/pages/reversi/game.board.vue
+++ b/packages/frontend/src/pages/reversi/game.board.vue
@@ -89,8 +89,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-if="game.isEnded" class="_panel _gaps_s" style="padding: 16px;">
<div>{{ logPos }} / {{ game.logs.length }}</div>
<div v-if="!autoplaying" class="_buttonsCenter">
- <MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ph-caret-left ph-bold ph-lg"></i></MkButton>
- <MkButton :disabled="logPos === 0" @click="logPos--"><i class="ph-caret-left ph-bold ph-lg"></i></MkButton>
+ <MkButton :disabled="logPos === 0" @click="logPos = 0"><i class="ti ti-chevrons-left"></i></MkButton>
+ <MkButton :disabled="logPos === 0" @click="logPos--"><i class="ti ti-chevron-left"></i></MkButton>
<MkButton :disabled="logPos === game.logs.length" @click="logPos++"><i class="ti ti-chevron-right"></i></MkButton>
<MkButton :disabled="logPos === game.logs.length" @click="logPos = game.logs.length"><i class="ti ti-chevrons-right"></i></MkButton>
</div>
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index a60d7209cf..3cc911c014 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -130,7 +130,7 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.avatarDecorations,
- icon: 'ph-sparkle ph-bold ph-lg',
+ icon: 'ti ti-sparkles',
}));
</script>
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 09d94cd1f5..aa2f04d01f 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -615,7 +615,7 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.general,
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
}));
const useCustomSearchEngine = computed(() => !Object.keys(searchEngineMap).includes(searchEngine.value));
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 91d19e3eb6..5430f4f726 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -67,7 +67,7 @@ const menuDef = computed(() => [{
to: '/settings/profile',
active: currentPage.value?.route.name === 'profile',
}, {
- icon: 'ph-lock ph-bold ph-lg-open',
+ icon: 'ti ti-lock-open',
text: i18n.ts.privacy,
to: '/settings/privacy',
active: currentPage.value?.route.name === 'privacy',
@@ -100,7 +100,7 @@ const menuDef = computed(() => [{
}, {
title: i18n.ts.clientSettings,
items: [{
- icon: 'ph-faders ph-bold ph-lg',
+ icon: 'ti ti-adjustments',
text: i18n.ts.general,
to: '/settings/general',
active: currentPage.value?.route.name === 'general',
diff --git a/packages/frontend/src/pages/settings/other.vue b/packages/frontend/src/pages/settings/other.vue
index 0ab8add737..99dab20000 100644
--- a/packages/frontend/src/pages/settings/other.vue
+++ b/packages/frontend/src/pages/settings/other.vue
@@ -82,7 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</FormSection>
<FormSection>
- <FormLink to="/registry"><template #icon><i class="ph-faders ph-bold ph-lg"></i></template>{{ i18n.ts.registry }}</FormLink>
+ <FormLink to="/registry"><template #icon><i class="ti ti-adjustments"></i></template>{{ i18n.ts.registry }}</FormLink>
</FormSection>
<FormSection>
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 86cf5ab241..b155d6e316 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -120,6 +120,6 @@ const headerTabs = computed(() => []);
definePageMetadata(() => ({
title: i18n.ts.privacy,
- icon: 'ph-lock ph-bold ph-lg-open',
+ icon: 'ti ti-lock-open',
}));
</script>
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 9c276f5525..0192513645 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkAvatar :class="$style.avatar" :user="$i" forceShowDecoration @click="changeAvatar"/>
<div class="_buttonsCenter">
<MkButton primary rounded @click="changeAvatar">{{ i18n.ts._profile.changeAvatar }}</MkButton>
- <MkButton primary rounded link to="/settings/avatar-decoration">{{ i18n.ts.decorate }} <i class="ph-sparkle ph-bold ph-lg"></i></MkButton>
+ <MkButton primary rounded link to="/settings/avatar-decoration">{{ i18n.ts.decorate }} <i class="ti ti-sparkles"></i></MkButton>
</div>
</div>
</div>
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index c9c5ca5a72..18c8a42262 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -303,7 +303,7 @@ const headerTabs = computed(() => [...(defaultStore.reactiveState.pinnedUserList
}, {
key: 'social',
title: i18n.ts._timelines.social,
- icon: 'ph-rocket-launch ph-bold ph-lg',
+ icon: 'ti ti-universe',
iconOnly: true,
}] : []), ...(isBubbleTimelineAvailable ? [{
key: 'bubble',
@@ -349,7 +349,7 @@ const headerTabsWhenNotLogin = computed(() => [
definePageMetadata(() => ({
title: i18n.ts.timeline,
- icon: src.value === 'local' ? 'ti ti-planet' : src.value === 'social' ? 'ph-rocket-launch ph-bold ph-lg' : src.value === 'global' ? 'ti ti-whirl' : src.value === 'bubble' ? 'ph-drop ph-bold ph-lg' : 'ti ti-home',
+ icon: src.value === 'local' ? 'ti ti-planet' : src.value === 'social' ? 'ti ti-universe' : src.value === 'global' ? 'ti ti-whirl' : src.value === 'bubble' ? 'ph-drop ph-bold ph-lg' : 'ti ti-home',
}));
</script>
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index e2355f1c10..bf0860a85b 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -36,7 +36,7 @@ function toolsMenuItems(): MenuItem[] {
type: 'link',
to: '/avatar-decorations',
text: i18n.ts.manageAvatarDecorations,
- icon: 'ph-sparkle ph-bold ph-lg',
+ icon: 'ti ti-sparkles',
} : undefined];
}
diff --git a/packages/frontend/src/widgets/WidgetTimeline.vue b/packages/frontend/src/widgets/WidgetTimeline.vue
index 6cb03fbc77..571b73311f 100644
--- a/packages/frontend/src/widgets/WidgetTimeline.vue
+++ b/packages/frontend/src/widgets/WidgetTimeline.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #icon>
<i v-if="widgetProps.src === 'home'" class="ti ti-home"></i>
<i v-else-if="widgetProps.src === 'local'" class="ti ti-planet"></i>
- <i v-else-if="widgetProps.src === 'social'" class="ph-rocket-launch ph-bold ph-lg"></i>
+ <i v-else-if="widgetProps.src === 'social'" class="ti ti-universe"></i>
<i v-else-if="widgetProps.src === 'bubble'" class="ph-drop ph-bold ph-lg"></i>
<i v-else-if="widgetProps.src === 'global'" class="ti ti-whirl"></i>
<i v-else-if="widgetProps.src === 'list'" class="ti ti-list"></i>
@@ -127,7 +127,7 @@ const choose = async (ev) => {
action: () => { setSrc('local'); },
}, {
text: i18n.ts._timelines.social,
- icon: 'ph-rocket-launch ph-bold ph-lg',
+ icon: 'ti ti-universe',
action: () => { setSrc('social'); },
}, {
text: 'Bubble',
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 59d46e5e09..3e0be175eb 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -309,7 +309,7 @@ export function getConfig(): UserConfig {
'icon ti ti-brand-youtube': 'icon ph-youtube-logo ph-bold ph-lg',
'ti ti-snowflake': 'ph-snowflake ph-bold ph-lg',
'ti ti-feather': 'ph-feather ph-bold ph-lg',
- 'ti ti-dice-5': 'ph ph-dice-5 ph-bold ph-lg',
+ 'ti ti-dice-5': 'ph ph-dice-five ph-bold ph-lg',
'ti ti-world-search': 'ph-binoculars ph-bold ph-lg',
'ti ti-list': 'ph-list ph-bold ph-lg',
'ti ti-antenna': 'ph-flying-saucer ph-bold ph-lg',
@@ -329,6 +329,15 @@ export function getConfig(): UserConfig {
'ti ti-paint': 'ph-paint-roller ph-bold ph-lg',
'ti ti-database': 'ph-database ph-bold ph-lg',
'ti ti-whirl': 'ph-globe-hemisphere-west ph-bold ph-lg',
+ 'ti ti-lock-open': 'ph-lock-open ph-bold ph-lg',
+ 'ti ti-photo-plus': 'ph-image-square ph-bold ph-lg',
+ 'ti ti-universe': 'ph-rocket-launch ph-bold ph-lg',
+ 'ti ti-sparkles': 'ph-sparkle ph-bold ph-lg',
+ 'ti ti-ghost': 'ph-ghost ph-bold ph-lg',
+ 'ti ti-adjustments': 'ph-faders ph-bold ph-lg',
+ 'ti ti-chevrons-left': 'ph-caret-dobule-left ph-bold ph-lg',
+ 'ti ti-chevron-left': 'ph-caret-left ph-bold ph-lg',
+ 'ti ti-dice': 'ph ph-dice-five ph-bold ph-lg',
},
}),
...process.env.NODE_ENV === 'production'