diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index 48939ef7a..570b15da0 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -228,7 +228,7 @@ } button { - border-radius: 999px; + border-radius: 4px; padding: 0px 12px 0px 12px; border: none; cursor: pointer; @@ -296,7 +296,7 @@ margin-bottom: 2rem; padding: 0.5rem 1rem; width: 40rem; - border-radius: 10px; + border-radius: 5px; justify-content: center; margin: auto; } diff --git a/packages/backend/src/server/web/error.css b/packages/backend/src/server/web/error.css index ea3056bda..8bad3d843 100644 --- a/packages/backend/src/server/web/error.css +++ b/packages/backend/src/server/web/error.css @@ -24,7 +24,7 @@ html { } button { - border-radius: 999px; + border-radius: 4px; padding: 0px 12px 0px 12px; border: none; cursor: pointer; @@ -93,7 +93,7 @@ code { background: #333; padding: 0.5rem 1rem; max-width: 40rem; - border-radius: 10px; + border-radius: 5px; justify-content: center; margin: auto; white-space: pre-wrap; diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 5119a19ca..af0352357 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -39,7 +39,7 @@ html link(rel='prefetch' href=infoImageUrl) link(rel='prefetch' href=notFoundImageUrl) //- https://github.com/misskey-dev/misskey/issues/9842 - link(rel='stylesheet' href='/assets/phosphor-icons/regular/style.css') + link(rel='stylesheet' href='/assets/phosphor-icons/bold/style.css') link(rel='modulepreload' href=`/vite/${clientEntry.file}`) if !config.clientManifestExists diff --git a/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts b/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts index a7b8cbb03..3640b656b 100644 --- a/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts +++ b/packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts @@ -63,7 +63,7 @@ import { M as MkContainer } from './MkContainer-!~{03M}~.js'; import { b as defineComponent, a as ref, e as onMounted, z as resolveComponent, g as openBlock, h as createBlock, i as withCtx, K as createTextVNode, E as toDisplayString, u as unref, l as createBaseVNode, q as normalizeClass, B as createCommentVNode, k as createElementBlock, F as Fragment, C as renderList, A as createVNode } from './vue-!~{002}~.js'; import './photoswipe-!~{003}~.js'; -const _hoisted_1 = /* @__PURE__ */ createBaseVNode("i", { class: "ti ti-photo" }, null, -1); +const _hoisted_1 = /* @__PURE__ */ createBaseVNode("i", { class: "ph-image-square ph-bold ph-lg" }, null, -1); const _sfc_main = /* @__PURE__ */ defineComponent({ __name: "index.photos", props: { @@ -179,7 +179,7 @@ import {M as MkContainer} from './MkContainer-!~{03M}~.js'; import {b as defineComponent, a as ref, e as onMounted, z as resolveComponent, g as openBlock, h as createBlock, i as withCtx, K as createTextVNode, E as toDisplayString, u as unref, l as createBaseVNode, q as normalizeClass, B as createCommentVNode, k as createElementBlock, F as Fragment, C as renderList, A as createVNode} from './vue-!~{002}~.js'; import './photoswipe-!~{003}~.js'; const _hoisted_1 = createBaseVNode("i", { - class: "ti ti-photo" + class: "ph-image-square ph-bold ph-lg" }, null, -1); const _sfc_main = defineComponent({ __name: "index.photos", @@ -348,7 +348,7 @@ const _sfc_main = defineComponent({ class: $style["date-1"] }, [ h("i", { - class: \`ti ti-chevron-up \${$style["date-1-icon"]}\` + class: \`ph-caret-up ph-bold ph-lg \${$style["date-1-icon"]}\` }), getDateText(item.createdAt) ]), @@ -357,7 +357,7 @@ const _sfc_main = defineComponent({ }, [ getDateText(props.items[i + 1].createdAt), h("i", { - class: \`ti ti-chevron-down \${$style["date-2-icon"]}\` + class: \`ph-caret-down ph-bold ph-lg \${$style["date-2-icon"]}\` }) ]) ])); @@ -514,11 +514,11 @@ const _sfc_main = defineComponent({ }, [h("span", { class: $style["date-1"] }, [h("i", { - class: \`ti ti-chevron-up \${$style["date-1-icon"]}\` + class: \`ph-caret-up ph-bold ph-lg \${$style["date-1-icon"]}\` }), getDateText(item.createdAt)]), h("span", { class: $style["date-2"] }, [getDateText(props.items[i + 1].createdAt), h("i", { - class: \`ti ti-chevron-down \${$style["date-2-icon"]}\` + class: \`ph-caret-down ph-bold ph-lg \${$style["date-2-icon"]}\` })])])); return [el, separator]; } else { diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts index c17be6fc6..f19cad331 100644 --- a/packages/frontend/src/account.ts +++ b/packages/frontend/src/account.ts @@ -286,7 +286,7 @@ export async function openAccountMenu(opts: { avatar: $i, }, null, ...(opts.includeCurrentAccount ? [createItem($i)] : []), ...accountItemPromises, { type: 'parent' as const, - icon: 'ti ti-plus', + icon: 'ph-plus ph-bold ph-lg', text: i18n.ts.addAccount, children: [{ text: i18n.ts.existingAccount, @@ -297,12 +297,12 @@ export async function openAccountMenu(opts: { }], }, { type: 'link' as const, - icon: 'ti ti-users', + icon: 'ph-users ph-bold ph-lg', text: i18n.ts.manageAccounts, to: '/settings/accounts', }, { type: 'button' as const, - icon: 'ti ti-power', + icon: 'ph-power ph-bold ph-lg', text: i18n.ts.logout, action: () => { signout(); }, }]], ev.currentTarget ?? ev.target, { diff --git a/packages/frontend/src/components/MkAbuseReport.vue b/packages/frontend/src/components/MkAbuseReport.vue index 66114b873..1ef8a205e 100644 --- a/packages/frontend/src/components/MkAbuseReport.vue +++ b/packages/frontend/src/components/MkAbuseReport.vue @@ -84,7 +84,7 @@ function resolve() { box-sizing: border-box; align-items: center; padding: 14px; - border-radius: 8px; + border-radius: 5px; --c: rgb(255 196 0 / 15%); background-image: linear-gradient(45deg, var(--c) 16.67%, transparent 16.67%, transparent 50%, var(--c) 50%, var(--c) 66.67%, transparent 66.67%, transparent 100%); background-size: 16px 16px; diff --git a/packages/frontend/src/components/MkAbuseReportWindow.vue b/packages/frontend/src/components/MkAbuseReportWindow.vue index 7814681ea..6819630b7 100644 --- a/packages/frontend/src/components/MkAbuseReportWindow.vue +++ b/packages/frontend/src/components/MkAbuseReportWindow.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -101,7 +101,7 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => list ? { title: list.name, - icon: 'ti ti-list', + icon: 'ph-list ph-bold pg-lg', } : null)); diff --git a/packages/frontend/src/pages/scratchpad.vue b/packages/frontend/src/pages/scratchpad.vue index 3dfd2d661..02bfa949d 100644 --- a/packages/frontend/src/pages/scratchpad.vue +++ b/packages/frontend/src/pages/scratchpad.vue @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -170,7 +170,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.scratchpad, - icon: 'ti ti-terminal-2', + icon: 'ph-terminal-window ph-bold ph-lg-2', }); diff --git a/packages/frontend/src/pages/search.note.vue b/packages/frontend/src/pages/search.note.vue index c1692d8be..22fcb7c24 100644 --- a/packages/frontend/src/pages/search.note.vue +++ b/packages/frontend/src/pages/search.note.vue @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue index 1a7501adc..c0b2e5598 100644 --- a/packages/frontend/src/pages/search.user.vue +++ b/packages/frontend/src/pages/search.user.vue @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + diff --git a/packages/frontend/src/pages/search.vue b/packages/frontend/src/pages/search.vue index e205fe850..e3a0b7585 100644 --- a/packages/frontend/src/pages/search.vue +++ b/packages/frontend/src/pages/search.vue @@ -43,15 +43,15 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => [{ key: 'note', title: i18n.ts.notes, - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', }, { key: 'user', title: i18n.ts.users, - icon: 'ti ti-users', + icon: 'ph-users ph-bold pg-lg', }]); definePageMetadata(computed(() => ({ title: i18n.ts.search, - icon: 'ti ti-search', + icon: 'ph-magnifying-glass ph-bold ph-lg', }))); diff --git a/packages/frontend/src/pages/settings/2fa.qrdialog.vue b/packages/frontend/src/pages/settings/2fa.qrdialog.vue index c2d1694c5..046e172e1 100644 --- a/packages/frontend/src/pages/settings/2fa.qrdialog.vue +++ b/packages/frontend/src/pages/settings/2fa.qrdialog.vue @@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.cancel }} - {{ i18n.ts.continue }} + {{ i18n.ts.continue }}
@@ -56,8 +56,8 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._2fa.step3 }}
- {{ i18n.ts.goBack }} - {{ i18n.ts.continue }} + {{ i18n.ts.goBack }} + {{ i18n.ts.continue }}
@@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._2fa.checkBackupCodesBeforeCloseThisWizard }}
- +
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue index 8a89a3a86..4e2f36737 100644 --- a/packages/frontend/src/pages/settings/2fa.vue +++ b/packages/frontend/src/pages/settings/2fa.vue @@ -16,10 +16,10 @@ SPDX-License-Identifier: AGPL-3.0-only - + - +
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +
@@ -55,8 +55,8 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.rename }} - {{ i18n.ts.unregister }} + {{ i18n.ts.rename }} + {{ i18n.ts.unregister }}
diff --git a/packages/frontend/src/pages/settings/accounts.vue b/packages/frontend/src/pages/settings/accounts.vue index df8c7b440..3f63c3dd7 100644 --- a/packages/frontend/src/pages/settings/accounts.vue +++ b/packages/frontend/src/pages/settings/accounts.vue @@ -8,8 +8,8 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.addAccount }} - {{ i18n.ts.reloadAccountsList }} + {{ i18n.ts.addAccount }} + {{ i18n.ts.reloadAccountsList }}
@@ -47,11 +47,11 @@ const init = async () => { function menu(account, ev) { os.popupMenu([{ text: i18n.ts.switch, - icon: 'ti ti-switch-horizontal', + icon: 'ph-arrows-left-right ph-bold ph-lg', action: () => switchAccount(account), }, { text: i18n.ts.logout, - icon: 'ti ti-trash', + icon: 'ph-trash ph-bold ph-lg', danger: true, action: () => removeAccount(account), }], ev.currentTarget ?? ev.target); @@ -107,7 +107,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.accounts, - icon: 'ti ti-users', + icon: 'ph-users ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/api.vue b/packages/frontend/src/pages/settings/api.vue index e0266bccb..66de0997a 100644 --- a/packages/frontend/src/pages/settings/api.vue +++ b/packages/frontend/src/pages/settings/api.vue @@ -46,6 +46,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: 'API', - icon: 'ti ti-api', + icon: 'ph-webhooks-logo ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/apps.vue b/packages/frontend/src/pages/settings/apps.vue index 7fd4ed61c..c06db2724 100644 --- a/packages/frontend/src/pages/settings/apps.vue +++ b/packages/frontend/src/pages/settings/apps.vue @@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -77,7 +77,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.installedApps, - icon: 'ti ti-plug', + icon: 'ph-plug ph-bold ph-lg', }); @@ -93,7 +93,7 @@ definePageMetadata({ margin: 0 12px 0 0; width: 50px; height: 50px; - border-radius: 8px; + border-radius: 5px; } .appBody { diff --git a/packages/frontend/src/pages/settings/custom-css.vue b/packages/frontend/src/pages/settings/custom-css.vue index d58f959fc..760c8da9b 100644 --- a/packages/frontend/src/pages/settings/custom-css.vue +++ b/packages/frontend/src/pages/settings/custom-css.vue @@ -47,6 +47,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.customCss, - icon: 'ti ti-code', + icon: 'ph-code ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/deck.vue b/packages/frontend/src/pages/settings/deck.vue index 9fecc65d6..ff9a78cd5 100644 --- a/packages/frontend/src/pages/settings/deck.vue +++ b/packages/frontend/src/pages/settings/deck.vue @@ -38,6 +38,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.deck, - icon: 'ti ti-columns', + icon: 'ph-text-columns ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/drive-cleaner.vue b/packages/frontend/src/pages/settings/drive-cleaner.vue index 899d824bf..791d76d1b 100644 --- a/packages/frontend/src/pages/settings/drive-cleaner.vue +++ b/packages/frontend/src/pages/settings/drive-cleaner.vue @@ -119,7 +119,7 @@ function onContextMenu(ev: MouseEvent, file): void { definePageMetadata({ title: i18n.ts.drivecleaner, - icon: 'ti ti-trash', + icon: 'ph-trash ph-bold ph-lg', }); @@ -152,7 +152,7 @@ definePageMetadata({ height: 12px; background: rgba(0, 0, 0, 0.1); overflow: clip; - border-radius: 999px; + border-radius: 4px; } .meterValue { diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue index 01a071168..0c6effbaa 100644 --- a/packages/frontend/src/pages/settings/drive.vue +++ b/packages/frontend/src/pages/settings/drive.vue @@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.uploadFolder }} - + {{ i18n.ts.drivecleaner }} @@ -140,7 +140,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.drive, - icon: 'ti ti-cloud', + icon: 'ph-cloud ph-bold ph-lg', }); @@ -148,12 +148,12 @@ definePageMetadata({ .meter { height: 10px; background: rgba(0, 0, 0, 0.1); - border-radius: 999px; + border-radius: 4px; overflow: clip; } .meterValue { height: 100%; - border-radius: 999px; + border-radius: 4px; } diff --git a/packages/frontend/src/pages/settings/email.vue b/packages/frontend/src/pages/settings/email.vue index 82b7f0ae4..6e7d78292 100644 --- a/packages/frontend/src/pages/settings/email.vue +++ b/packages/frontend/src/pages/settings/email.vue @@ -8,9 +8,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + @@ -112,6 +112,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.email, - icon: 'ti ti-mail', + icon: 'ph-envelope ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 771f43c66..f497b2b32 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -20,9 +20,9 @@ SPDX-License-Identifier: AGPL-3.0-only - - - + + + @@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.add }} - {{ i18n.ts.remove }} + {{ i18n.ts.remove }}
@@ -91,16 +91,16 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - - + + + + - - + + {{ i18n.ts._notification.checkNotificationBehavior }} @@ -172,12 +172,12 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ lang }}{{ defaultStore.reactiveState.additionalUnicodeEmojiIndexes.value[lang] ? ` (${ i18n.ts.installed })` : '' }} - {{ i18n.ts.remove }} + {{ lang }}{{ defaultStore.reactiveState.additionalUnicodeEmojiIndexes.value[lang] ? ` (${ i18n.ts.installed })` : '' }} + {{ i18n.ts.remove }}
{{ i18n.ts.deck }} - {{ i18n.ts.customCss }} + {{ i18n.ts.customCss }}
@@ -370,6 +370,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.general, - icon: 'ti ti-adjustments', + icon: 'ph-faders ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/import-export.vue b/packages/frontend/src/pages/settings/import-export.vue index 0574a878a..24dcdeacc 100644 --- a/packages/frontend/src/pages/settings/import-export.vue +++ b/packages/frontend/src/pages/settings/import-export.vue @@ -6,27 +6,27 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -53,6 +53,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.instanceMute, - icon: 'ti ti-planet-off', + icon: 'ph-prohibit ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue index 15bf4691b..3b47189eb 100644 --- a/packages/frontend/src/pages/settings/migration.vue +++ b/packages/frontend/src/pages/settings/migration.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.addItem }} - {{ i18n.ts.default }} - {{ i18n.ts.save }} + {{ i18n.ts.addItem }} + {{ i18n.ts.default }} + {{ i18n.ts.save }}
@@ -121,7 +121,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.navbar, - icon: 'ti ti-list', + icon: 'ph-list ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue index 5b3c29e7c..94cff90e0 100644 --- a/packages/frontend/src/pages/settings/notifications.vue +++ b/packages/frontend/src/pages/settings/notifications.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -150,6 +150,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.other, - icon: 'ti ti-dots', + icon: 'ph-dots-three ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/plugin.install.vue b/packages/frontend/src/pages/settings/plugin.install.vue index 47ebe9cfd..29ece7299 100644 --- a/packages/frontend/src/pages/settings/plugin.install.vue +++ b/packages/frontend/src/pages/settings/plugin.install.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.install }} + {{ i18n.ts.install }}
@@ -150,6 +150,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._plugin.install, - icon: 'ti ti-download', + icon: 'ph-download ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/plugin.vue b/packages/frontend/src/pages/settings/plugin.vue index 4a2d8d600..24326ac40 100644 --- a/packages/frontend/src/pages/settings/plugin.vue +++ b/packages/frontend/src/pages/settings/plugin.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only @@ -74,6 +74,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.sounds, - icon: 'ti ti-music', + icon: 'ph-music-notes ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/statusbar.vue b/packages/frontend/src/pages/settings/statusbar.vue index 7103c2582..02d678a2b 100644 --- a/packages/frontend/src/pages/settings/statusbar.vue +++ b/packages/frontend/src/pages/settings/statusbar.vue @@ -51,6 +51,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.statusbar, - icon: 'ti ti-list', + icon: 'ph-list ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue index 155ce9d9d..428dc16f6 100644 --- a/packages/frontend/src/pages/settings/theme.install.vue +++ b/packages/frontend/src/pages/settings/theme.install.vue @@ -10,8 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.preview }} - {{ i18n.ts.install }} + {{ i18n.ts.preview }} + {{ i18n.ts.install }}
@@ -80,6 +80,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._theme.install, - icon: 'ti ti-download', + icon: 'ph-download ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/theme.manage.vue b/packages/frontend/src/pages/settings/theme.manage.vue index 8c90c175f..484e83be4 100644 --- a/packages/frontend/src/pages/settings/theme.manage.vue +++ b/packages/frontend/src/pages/settings/theme.manage.vue @@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.uninstall }} + {{ i18n.ts.uninstall }} @@ -78,6 +78,6 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts._theme.manage, - icon: 'ti ti-tool', + icon: 'ph-wrench ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue index 9e55a8fd8..1f67d3785 100644 --- a/packages/frontend/src/pages/settings/theme.vue +++ b/packages/frontend/src/pages/settings/theme.vue @@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + @@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -58,10 +58,10 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts._theme.manage }} - {{ i18n.ts._theme.explore }} - {{ i18n.ts._theme.install }} - {{ i18n.ts._theme.make }} + {{ i18n.ts._theme.manage }} + {{ i18n.ts._theme.explore }} + {{ i18n.ts._theme.install }} + {{ i18n.ts._theme.make }}
@@ -166,13 +166,13 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.theme, - icon: 'ti ti-palette', + icon: 'ph-palette ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/welcome.setup.vue b/packages/frontend/src/pages/welcome.setup.vue index ec47fc8ad..bac6cc1f0 100644 --- a/packages/frontend/src/pages/welcome.setup.vue +++ b/packages/frontend/src/pages/welcome.setup.vue @@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +
diff --git a/packages/frontend/src/pages/welcome.timeline.vue b/packages/frontend/src/pages/welcome.timeline.vue index f2e151468..823f713d3 100644 --- a/packages/frontend/src/pages/welcome.timeline.vue +++ b/packages/frontend/src/pages/welcome.timeline.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + RN: ...
@@ -88,7 +88,7 @@ onUpdated(() => { padding: 16px; margin: 0 0 0 auto; max-width: max-content; - border-radius: 16px; + border-radius: 4px; } .richcontent { diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts index 096410824..a01df8cf5 100644 --- a/packages/frontend/src/scripts/get-drive-file-menu.ts +++ b/packages/frontend/src/scripts/get-drive-file-menu.ts @@ -78,50 +78,50 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss let menu; menu = [{ text: i18n.ts.rename, - icon: 'ti ti-forms', + icon: 'ph-textbox ph-bold ph-lg', action: () => rename(file), }, { text: file.isSensitive ? i18n.ts.unmarkAsSensitive : i18n.ts.markAsSensitive, - icon: file.isSensitive ? 'ti ti-eye' : 'ti ti-eye-exclamation', + icon: file.isSensitive ? 'ph-eye ph-bold ph-lg' : 'ph-eye-closed ph-bold ph-lg', action: () => toggleSensitive(file), }, { text: i18n.ts.describeFile, - icon: 'ti ti-text-caption', + icon: 'ph-text-indent ph-bold ph-lg', action: () => describe(file), }, ...isImage ? [{ text: i18n.ts.cropImage, - icon: 'ti ti-crop', + icon: 'ph-crop ph-bold ph-lg', action: () => os.cropImage(file, { aspectRatio: NaN, uploadFolder: folder ? folder.id : folder, }), }] : [], null, { text: i18n.ts.createNoteFromTheFile, - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', action: () => os.post({ initialFiles: [file], }), }, { text: i18n.ts.copyUrl, - icon: 'ti ti-link', + icon: 'ph-link ph-bold ph-lg', action: () => copyUrl(file), }, { type: 'a', href: file.url, target: '_blank', text: i18n.ts.download, - icon: 'ti ti-download', + icon: 'ph-download ph-bold ph-lg', download: file.name, }, null, { text: i18n.ts.delete, - icon: 'ti ti-trash', + icon: 'ph-trash ph-bold ph-lg', danger: true, action: () => deleteFile(file), }]; if (defaultStore.state.devMode) { menu = menu.concat([null, { - icon: 'ti ti-id', + icon: 'ph-identification-card ph-bold ph-lg', text: i18n.ts.copyFileId, action: () => { copyToClipboard(file.id); diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 99475d623..4889efe10 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -60,7 +60,7 @@ export async function getNoteClipMenu(props: { ); }, })), null, { - icon: 'ti ti-plus', + icon: 'ph-plus ph-bold ph-lg', text: i18n.ts.createNew, action: async () => { const { canceled, result } = await os.form(i18n.ts.createNewClip, { @@ -94,7 +94,7 @@ export async function getNoteClipMenu(props: { export function getAbuseNoteMenu(note: misskey.entities.Note, text: string): MenuItem { return { - icon: 'ti ti-exclamation-circle', + icon: 'ph-warning-circle ph-bold ph-lg', text, action: (): void => { const u = note.url ?? note.uri ?? `${url}/notes/${note.id}`; @@ -108,7 +108,7 @@ export function getAbuseNoteMenu(note: misskey.entities.Note, text: string): Men export function getCopyNoteLinkMenu(note: misskey.entities.Note, text: string): MenuItem { return { - icon: 'ti ti-link', + icon: 'ph-link ph-bold ph-lg', text, action: (): void => { copyToClipboard(`${url}/notes/${note.id}`); @@ -267,74 +267,74 @@ export function getNoteMenu(props: { menu = [ ...( props.currentClip?.userId === $i.id ? [{ - icon: 'ti ti-backspace', + icon: 'ph-backspace ph-bold ph-lg', text: i18n.ts.unclip, danger: true, action: unclip, }, null] : [] ), { - icon: 'ti ti-info-circle', + icon: 'ph-info ph-bold ph-lg', text: i18n.ts.details, action: openDetail, }, { - icon: 'ti ti-copy', + icon: 'ph-copy ph-bold ph-lg', text: i18n.ts.copyContent, action: copyContent, }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink) , (appearNote.url || appearNote.uri) ? { - icon: 'ti ti-external-link', + icon: 'ph-arrow-square-out ph-bold ph-lg', text: i18n.ts.showOnRemote, action: () => { window.open(appearNote.url ?? appearNote.uri, '_blank'); }, } : undefined, { - icon: 'ti ti-share', + icon: 'ph-share-network ph-bold pg-lg', text: i18n.ts.share, action: share, }, instance.translatorAvailable ? { - icon: 'ti ti-language-hiragana', + icon: 'ph-translate ph-bold ph-lg', text: i18n.ts.translate, action: translate, } : undefined, null, statePromise.then(state => state.isFavorited ? { - icon: 'ti ti-star-off', + icon: 'ph-star-half ph-bold pg-lg', text: i18n.ts.unfavorite, action: () => toggleFavorite(false), } : { - icon: 'ti ti-star', + icon: 'ph-star ph-bold pg-lg', text: i18n.ts.favorite, action: () => toggleFavorite(true), }), { type: 'parent' as const, - icon: 'ti ti-paperclip', + icon: 'ph-paperclip ph-bold ph-lg', text: i18n.ts.clip, children: () => getNoteClipMenu(props), }, statePromise.then(state => state.isMutedThread ? { - icon: 'ti ti-message-off', + icon: 'ph-bell-slash ph-bold ph-lg', text: i18n.ts.unmuteThread, action: () => toggleThreadMute(false), } : { - icon: 'ti ti-message-off', + icon: 'ph-bell-slash ph-bold ph-lg', text: i18n.ts.muteThread, action: () => toggleThreadMute(true), }), appearNote.userId === $i.id ? ($i.pinnedNoteIds ?? []).includes(appearNote.id) ? { - icon: 'ti ti-pinned-off', + icon: 'ph-push-pin ph-bold ph-lgned-off', text: i18n.ts.unpin, action: () => togglePin(false), } : { - icon: 'ti ti-pin', + icon: 'ph-push-pin ph-bold ph-lg', text: i18n.ts.pin, action: () => togglePin(true), } : undefined, { type: 'parent' as const, - icon: 'ti ti-user', + icon: 'ph-user ph-bold ph-lg', text: i18n.ts.user, children: async () => { const user = appearNote.userId === $i?.id ? $i : await os.api('users/show', { userId: appearNote.userId }); @@ -347,7 +347,7 @@ export function getNoteMenu(props: { ...($i.isModerator || $i.isAdmin ? [ null, { - icon: 'ti ti-speakerphone', + icon: 'ph-megaphone ph-bold ph-lg', text: i18n.ts.promote, action: promote }] @@ -362,18 +362,18 @@ export function getNoteMenu(props: { ...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [ null, appearNote.userId === $i.id ? { - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', text: i18n.ts.edit, action: edit, } : undefined, { - icon: 'ti ti-edit', + icon: 'ph-pencil-line ph-bold pg-lg', text: i18n.ts.deleteAndEdit, danger: true, action: delEdit, }, { - icon: 'ti ti-trash', + icon: 'ph-trash ph-bold ph-lg', text: i18n.ts.delete, danger: true, action: del, @@ -383,16 +383,16 @@ export function getNoteMenu(props: { .filter(x => x !== undefined); } else { menu = [{ - icon: 'ti ti-info-circle', + icon: 'ph-info ph-bold ph-lg', text: i18n.ts.details, action: openDetail, }, { - icon: 'ti ti-copy', + icon: 'ph-copy ph-bold ph-lg', text: i18n.ts.copyContent, action: copyContent, }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink) , (appearNote.url || appearNote.uri) ? { - icon: 'ti ti-external-link', + icon: 'ph-arrow-square-out ph-bold ph-lg', text: i18n.ts.showOnRemote, action: () => { window.open(appearNote.url ?? appearNote.uri, '_blank'); @@ -403,7 +403,7 @@ export function getNoteMenu(props: { if (noteActions.length > 0) { menu = menu.concat([null, ...noteActions.map(action => ({ - icon: 'ti ti-plug', + icon: 'ph-plug ph-bold ph-lg', text: action.title, action: () => { action.handler(appearNote); @@ -413,7 +413,7 @@ export function getNoteMenu(props: { if (defaultStore.state.devMode) { menu = menu.concat([null, { - icon: 'ti ti-id', + icon: 'ph-identification-card ph-bold ph-lg', text: i18n.ts.copyNoteId, action: () => { copyToClipboard(appearNote.id); diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts index 128cbafb1..24ca93495 100644 --- a/packages/frontend/src/scripts/get-user-menu.ts +++ b/packages/frontend/src/scripts/get-user-menu.ts @@ -137,46 +137,46 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router } let menu = [{ - icon: 'ti ti-at', + icon: 'ph-at ph-bold ph-lg', text: i18n.ts.copyUsername, action: () => { copyToClipboard(`@${user.username}@${user.host ?? host}`); }, }, ...(iAmModerator ? [{ - icon: 'ti ti-user-exclamation', + icon: 'ph-warning-circle ph-bold ph-lg', text: i18n.ts.moderation, action: () => { router.push(`/admin/user/${user.id}`); }, }] : []), { - icon: 'ti ti-rss', + icon: 'ph-rss ph-bold ph-lg', text: i18n.ts.copyRSS, action: () => { copyToClipboard(`${user.host ?? host}/@${user.username}.atom`); }, }, { - icon: 'ti ti-share', + icon: 'ph-share-network ph-bold pg-lg', text: i18n.ts.copyProfileUrl, action: () => { const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`; copyToClipboard(`${url}/${canonical}`); }, }, { - icon: 'ti ti-mail', + icon: 'ph-envelope ph-bold ph-lg', text: i18n.ts.sendMessage, action: () => { const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${user.host}`; os.post({ specified: user, initialText: `${canonical} ` }); }, }, null, { - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', text: i18n.ts.editMemo, action: () => { editMemo(); }, }, { type: 'parent', - icon: 'ti ti-list', + icon: 'ph-list ph-bold pg-lg', text: i18n.ts.addToList, children: async () => { const lists = await userListsCache.fetch(); @@ -209,7 +209,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router }, }, { type: 'parent', - icon: 'ti ti-antenna', + icon: 'ph-flying-saucer ph-bold pg-lg', text: i18n.ts.addToAntenna, children: async () => { const antennas = await antennasCache.fetch(); @@ -240,7 +240,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router if (iAmModerator) { menu = menu.concat([{ type: 'parent', - icon: 'ti ti-badges', + icon: 'ph-seal-check ph-bold pg-lg', text: i18n.ts.roles, children: async () => { const roles = await rolesCache.fetch(); @@ -282,36 +282,36 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router // フォローしたとしても user.isFollowing はリアルタイム更新されないので不便なため //if (user.isFollowing) { menu = menu.concat([{ - icon: user.notify === 'none' ? 'ti ti-bell' : 'ti ti-bell-off', + icon: user.notify === 'none' ? 'ph-bell ph-bold pg-lg' : 'ph-bell ph-bold pg-lg-off', text: user.notify === 'none' ? i18n.ts.notifyNotes : i18n.ts.unnotifyNotes, action: toggleNotify, }]); //} menu = menu.concat([null, { - icon: user.isMuted ? 'ti ti-eye' : 'ti ti-eye-off', + icon: user.isMuted ? 'ph-eye ph-bold ph-lg' : 'ph-eye-slash ph-bold ph-lg', text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute, action: toggleMute, }, { - icon: user.isRenoteMuted ? 'ti ti-repeat' : 'ti ti-repeat-off', + icon: user.isRenoteMuted ? 'ph-repeat ph-bold ph-lg' : 'ph-repeat ph-bold ph-lg-off', text: user.isRenoteMuted ? i18n.ts.renoteUnmute : i18n.ts.renoteMute, action: toggleRenoteMute, }, { - icon: 'ti ti-ban', + icon: 'ph-prohibit ph-bold ph-lg', text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block, action: toggleBlock, }]); if (user.isFollowed) { menu = menu.concat([{ - icon: 'ti ti-link-off', + icon: 'ph-link ph-bold ph-lg-off', text: i18n.ts.breakFollow, action: invalidateFollow, }]); } menu = menu.concat([null, { - icon: 'ti ti-exclamation-circle', + icon: 'ph-warning-circle ph-bold ph-lg', text: i18n.ts.reportAbuse, action: reportAbuse, }]); @@ -319,7 +319,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router if (defaultStore.state.devMode) { menu = menu.concat([null, { - icon: 'ti ti-id', + icon: 'ph-identification-card ph-bold ph-lg', text: i18n.ts.copyUserId, action: () => { copyToClipboard(user.id); @@ -329,7 +329,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router if ($i && meId === user.id) { menu = menu.concat([null, { - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', text: i18n.ts.editProfile, action: () => { router.push('/settings/profile'); @@ -339,7 +339,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router if (userActions.length > 0) { menu = menu.concat([null, ...userActions.map(action => ({ - icon: 'ti ti-plug', + icon: 'ph-plug ph-bold ph-lg', text: action.title, action: () => { action.handler(user); diff --git a/packages/frontend/src/scripts/select-file.ts b/packages/frontend/src/scripts/select-file.ts index 53e2cd5b1..674c762fa 100644 --- a/packages/frontend/src/scripts/select-file.ts +++ b/packages/frontend/src/scripts/select-file.ts @@ -92,15 +92,15 @@ function select(src: any, label: string | null, multiple: boolean): Promise chooseFileFromPc(multiple, keepOriginal.value).then(files => res(files)), }, { text: i18n.ts.fromDrive, - icon: 'ti ti-cloud', + icon: 'ph-cloud ph-bold ph-lg', action: () => chooseFileFromDrive(multiple).then(files => res(files)), }, { text: i18n.ts.fromUrl, - icon: 'ti ti-link', + icon: 'ph-link ph-bold ph-lg', action: () => chooseFileFromUrl().then(file => res([file])), }], src); }); diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 53d9b06ab..69306d5b9 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -63,11 +63,11 @@ export const defaultStore = markRaw(new Storage('base', { }, collapseRenotes: { where: 'account', - default: true, + default: false, }, collapseFiles: { where: 'account', - default: true, + default: false, }, rememberNoteVisibility: { where: 'account', diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss index 6efb6077c..df2f953c5 100644 --- a/packages/frontend/src/style.scss +++ b/packages/frontend/src/style.scss @@ -15,7 +15,7 @@ */ :root { - --radius: 12px; + --radius: 5px; --marginFull: 16px; --marginHalf: 10px; @@ -140,7 +140,7 @@ hr { background: var(--divider); } -.ti { +.ph-bold { width: 1.28em; vertical-align: -12%; line-height: 1em; @@ -391,7 +391,7 @@ hr { vertical-align: bottom; height: 128px; margin-bottom: 16px; - border-radius: 16px; + border-radius: 4px; } } diff --git a/packages/frontend/src/ui/_common_/announcements.vue b/packages/frontend/src/ui/_common_/announcements.vue index 2b1133d47..913fa35cc 100644 --- a/packages/frontend/src/ui/_common_/announcements.vue +++ b/packages/frontend/src/ui/_common_/announcements.vue @@ -12,10 +12,10 @@ SPDX-License-Identifier: AGPL-3.0-only to="/announcements" > - - - - + + + + {{ announcement.title }} {{ announcement.text }} diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index 49fe5a834..3810be4fe 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -16,61 +16,61 @@ export function openInstanceMenu(ev: MouseEvent) { }, { type: 'link', text: i18n.ts.instanceInfo, - icon: 'ti ti-info-circle', + icon: 'ph-info ph-bold ph-lg', to: '/about', }, { type: 'link', text: i18n.ts.customEmojis, - icon: 'ti ti-icons', + icon: 'ph-smiley ph-bold pg-lg', to: '/about#emojis', }, { type: 'link', text: i18n.ts.federation, - icon: 'ti ti-whirl', + icon: 'ph-globe-hemisphere-west ph-bold ph-lg', to: '/about#federation', }, { type: 'link', text: i18n.ts.charts, - icon: 'ti ti-chart-line', + icon: 'ph-chart-line ph-bold pg-lg', to: '/about#charts', }, null, { type: 'link', text: i18n.ts.ads, - icon: 'ti ti-ad', + icon: 'ph-flag ph-bold ph-lg', to: '/ads', }, ($i && ($i.isAdmin || $i.policies.canInvite) && instance.disableRegistration) ? { type: 'link', to: '/invite', text: i18n.ts.invite, - icon: 'ti ti-user-plus', + icon: 'ph-user-plus ph-bold ph-lg', } : undefined, { type: 'parent', text: i18n.ts.tools, - icon: 'ti ti-tool', + icon: 'ph-wrench ph-bold ph-lg', children: [{ type: 'link', to: '/scratchpad', text: i18n.ts.scratchpad, - icon: 'ti ti-terminal-2', + icon: 'ph-terminal-window ph-bold ph-lg-2', }, { type: 'link', to: '/api-console', text: 'API Console', - icon: 'ti ti-terminal-2', + icon: 'ph-terminal-window ph-bold ph-lg-2', }, { type: 'link', to: '/clicker', text: '🍪👈', - icon: 'ti ti-cookie', + icon: 'ph-cookie ph-bold pg-lg', }, ($i && ($i.isAdmin || $i.policies.canManageCustomEmojis)) ? { type: 'link', to: '/custom-emojis-manager', text: i18n.ts.manageCustomEmojis, - icon: 'ti ti-icons', + icon: 'ph-smiley ph-bold pg-lg', } : undefined], }, null, { text: i18n.ts.help, - icon: 'ti ti-help-circle', + icon: 'ph-question ph-bold ph-lg', action: () => { window.open('https://misskey-hub.net/help.html', '_blank'); }, diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue index eed4cc777..70dbc7e0b 100644 --- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue +++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue @@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.timeline }} + {{ i18n.ts.timeline }}
- {{ i18n.ts.controlPanel }} + {{ i18n.ts.controlPanel }} - {{ i18n.ts.settings }} + {{ i18n.ts.settings }}
- {{ i18n.ts.timeline }} + {{ i18n.ts.timeline }}
- {{ i18n.ts.controlPanel }} + {{ i18n.ts.controlPanel }} - {{ i18n.ts.settings }} + {{ i18n.ts.settings }}