From 277fa8707b5b2b6eb9a9ca07e2c3f0142afdb113 Mon Sep 17 00:00:00 2001 From: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Sat, 30 Sep 2023 16:43:54 +0200 Subject: [PATCH 01/24] test: fix font --- packages/backend/src/server/web/views/base.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 08cd80d3d..af0b4c759 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/tabler-icons/tabler-icons.min.css?v2.35.0') + link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css') link(rel='modulepreload' href=`/vite/${clientEntry.file}`) if !config.clientManifestExists From 2b4e9e5b8c91f0c3693445a9bb8a105328ef030b Mon Sep 17 00:00:00 2001 From: Marie Date: Sat, 30 Sep 2023 17:04:37 +0200 Subject: [PATCH 02/24] upd: remove overscroll --- packages/frontend/src/ui/universal.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue index cc66bb47a..38168cc19 100644 --- a/packages/frontend/src/ui/universal.vue +++ b/packages/frontend/src/ui/universal.vue @@ -240,7 +240,6 @@ body { position: fixed; top: 0; left: 0; - overscroll-behavior: none; } #misskey_app { From 00c14b98a38caa62a9615b6abe54a769b609af27 Mon Sep 17 00:00:00 2001 From: Insert5StarName Date: Sat, 30 Sep 2023 17:55:21 +0200 Subject: [PATCH 03/24] upd: fix defaults, make people happy --- packages/frontend/src/scripts/sound.ts | 2 +- packages/frontend/src/store.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts index 1ef41b47d..fca25c737 100644 --- a/packages/frontend/src/scripts/sound.ts +++ b/packages/frontend/src/scripts/sound.ts @@ -17,7 +17,7 @@ export const soundConfigStore = markRaw(new Storage('sound', { }, sound_note: { where: 'account', - default: { type: 'syuilo/n-aec', volume: 1 }, + default: { type: 'syuilo/n-aec', volume: 0 }, }, sound_noteMy: { where: 'account', diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 37bc6e341..53d9b06ab 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -307,7 +307,7 @@ export const defaultStore = markRaw(new Storage('base', { }, squareAvatars: { where: 'device', - default: false, + default: true, }, postFormWithHashtags: { where: 'device', From f2e299a7a9d338ed31ea45acb08cef1146d6b704 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sat, 30 Sep 2023 18:52:13 +0200 Subject: [PATCH 04/24] upd: change icon font --- .../backend/src/server/web/views/base.pug | 4 +- packages/frontend/package.json | 1 + pnpm-lock.yaml | 88 +++---------------- scripts/build-assets.mjs | 2 +- 4 files changed, 17 insertions(+), 78 deletions(-) diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index af0b4c759..5119a19ca 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/tabler-icons/tabler-icons.min.css') + link(rel='stylesheet' href='/assets/phosphor-icons/regular/style.css') link(rel='modulepreload' href=`/vite/${clientEntry.file}`) if !config.clientManifestExists @@ -51,7 +51,7 @@ html title block title - = title || 'Misskey' + = title || 'Sharkey' block desc meta(name='description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') diff --git a/packages/frontend/package.json b/packages/frontend/package.json index f579da3cb..f04d554e6 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -18,6 +18,7 @@ "dependencies": { "@discordapp/twemoji": "14.1.2", "@github/webauthn-json": "2.1.1", + "@phosphor-icons/web": "^2.0.3", "@rollup/plugin-alias": "5.0.0", "@rollup/plugin-json": "6.0.0", "@rollup/plugin-replace": "5.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a61c36f76..1f3d0aab7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -661,6 +661,9 @@ importers: '@github/webauthn-json': specifier: 2.1.1 version: 2.1.1 + '@phosphor-icons/web': + specifier: ^2.0.3 + version: 2.0.3 '@rollup/plugin-alias': specifier: 5.0.0 version: 5.0.0(rollup@3.29.2) @@ -994,7 +997,7 @@ importers: version: 7.4.4 storybook-addon-misskey-theme: specifier: github:misskey-dev/storybook-addon-misskey-theme - version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.4.4)(@storybook/components@7.4.3)(@storybook/core-events@7.4.4)(@storybook/manager-api@7.4.4)(@storybook/preview-api@7.4.4)(@storybook/theming@7.4.4)(@storybook/types@7.4.4)(react-dom@18.2.0)(react@18.2.0) + version: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.4.4)(@storybook/components@7.4.4)(@storybook/core-events@7.4.4)(@storybook/manager-api@7.4.4)(@storybook/preview-api@7.4.4)(@storybook/theming@7.4.4)(@storybook/types@7.4.4)(react-dom@18.2.0)(react@18.2.0) summaly: specifier: github:misskey-dev/summaly version: github.com/misskey-dev/summaly/d2d8db49943ccb201c1b1b283e9d0a630519fac7 @@ -4759,6 +4762,10 @@ packages: engines: {node: '>=10'} dev: false + /@phosphor-icons/web@2.0.3: + resolution: {integrity: sha512-9oYmohi2fo87w3DbtfjBoJxrklVojgXq2wuGcqxKccj2TxMq7UIusKDrGUZYOQHM9pUKkh+kvfmutETMGDR6gg==} + dev: false + /@pkgjs/parseargs@0.11.0: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -6371,17 +6378,6 @@ packages: - supports-color dev: true - /@storybook/channels@7.4.3: - resolution: {integrity: sha512-lIoRX3EV0wKPX8ojIrJUtsOv4+Gv8r9pfJpam/NdyYd+rs0AjDK13ieINRfBMnJkfjsWa3vmZtGMBEVvDKwTMw==} - dependencies: - '@storybook/client-logger': 7.4.3 - '@storybook/core-events': 7.4.3 - '@storybook/global': 5.0.0 - qs: 6.11.1 - telejson: 7.2.0 - tiny-invariant: 1.3.1 - dev: true - /@storybook/channels@7.4.4: resolution: {integrity: sha512-YA2T3hClL95nFBBelm8wMOyWFDzfxKvyHAPQi+8YeYpZcPivwg/P9YnRhTTMbiZNkfoWKq4ZRuc79UP1iNLi3g==} dependencies: @@ -6445,12 +6441,6 @@ packages: - utf-8-validate dev: true - /@storybook/client-logger@7.4.3: - resolution: {integrity: sha512-Nhngo9X4HjN00aRhgIVGWbwkWPe0Fz8PySuxnd8nAxSsz7KpdLFyYo2TbZZ3TX51FG5Fxcb0G5OHuunItP7EWQ==} - dependencies: - '@storybook/global': 5.0.0 - dev: true - /@storybook/client-logger@7.4.4: resolution: {integrity: sha512-rC/GcCy3DLtTI+oOHLBc6rq/c3oGF/mvdeWrhMM+berQplHJrOCI2pcldjVw8Fc25gLPK0LUlaOp1dfgt2Ri3Q==} dependencies: @@ -6478,29 +6468,6 @@ packages: - supports-color dev: true - /@storybook/components@7.4.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-qwRW8wGUuM+H6oKUXXoIDrZECXh/lzowrWXFAzZiocovYEhPtZfl/yvJLWHjOwtka3n7lA7J7EtcjWe8/tueJQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - '@radix-ui/react-select': 1.2.2(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-toolbar': 1.0.4(react-dom@18.2.0)(react@18.2.0) - '@storybook/client-logger': 7.4.3 - '@storybook/csf': 0.1.0 - '@storybook/global': 5.0.0 - '@storybook/theming': 7.4.3(react-dom@18.2.0)(react@18.2.0) - '@storybook/types': 7.4.3 - memoizerific: 1.11.3 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0) - util-deprecate: 1.0.2 - transitivePeerDependencies: - - '@types/react' - - '@types/react-dom' - dev: true - /@storybook/components@7.4.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-tFOSu3IoAab/0aY2TY66Go0Nba7AB/+ZB9GFet+dxWypIKGLcPjyX2POIumJU4swzK+4IA8GxgDQ2itS6EOISQ==} peerDependencies: @@ -6562,12 +6529,6 @@ packages: - supports-color dev: true - /@storybook/core-events@7.4.3: - resolution: {integrity: sha512-FRfipCijMnVbGxL1ZjOLM836lyd/TGQcUFeVjTQWW/+pIGHELqDHiYeq68hqoGTKl0G0np59CJPWYTUZA4Dl9Q==} - dependencies: - ts-dedent: 2.2.0 - dev: true - /@storybook/core-events@7.4.4: resolution: {integrity: sha512-kOf4I/a1XC9CaGFwJG5WR2KnkwrOkWX68TLh7OlelKxdl/WjxA4zfzaFPC/8zyCSLdGFLPKNqr1w+ezkb+9Irw==} dependencies: @@ -6902,20 +6863,6 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/theming@7.4.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-u5wLwWmhGcTmkcs6f2wDGv+w8wzwbNJat0WaIIbwdJfX7arH6nO5HkBhNxvl6FUFxX0tovp/e9ULzxVPc356jw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - '@emotion/use-insertion-effect-with-fallbacks': 1.0.0(react@18.2.0) - '@storybook/client-logger': 7.4.3 - '@storybook/global': 5.0.0 - memoizerific: 1.11.3 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - dev: true - /@storybook/theming@7.4.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-ABIwLRUj2IZKMGxKq+fCCFcY7w52P1a+q8j7qrlELaTe4M74K6rwTgRF0/AFgWeiGRkNuA7z8DjQ73xQLoLqUg==} peerDependencies: @@ -6930,15 +6877,6 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /@storybook/types@7.4.3: - resolution: {integrity: sha512-DrHC1hIiw9TqDILLokDnvbUPNxGz5iJaYFEv30uvYE0s9MvgEUPblCChEUjaHOps7zQTznMPf8ULfoXlgqxk2A==} - dependencies: - '@storybook/channels': 7.4.3 - '@types/babel__core': 7.20.0 - '@types/express': 4.17.17 - file-system-cache: 2.3.0 - dev: true - /@storybook/types@7.4.4: resolution: {integrity: sha512-B0VdgGb1XGEb9g3UuEd9xANCIhR3anvA3w0uYSG+7uMOflnEawwZksTSxvvoGM2hx9vC4pNT4Fci9sEC903UkA==} dependencies: @@ -6994,7 +6932,7 @@ packages: ts-dedent: 2.2.0 type-fest: 2.19.0 vue: 3.3.4 - vue-component-type-helpers: 1.8.14 + vue-component-type-helpers: 1.8.15 transitivePeerDependencies: - encoding - supports-color @@ -19598,8 +19536,8 @@ packages: resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} dev: true - /vue-component-type-helpers@1.8.14: - resolution: {integrity: sha512-veuaNIJas+dkRflRumpnY0e0HWqrUrqg5CdWxK/CbQvJ96V4uVOM5eJbj6cJX3rFNmc7+LO3ySHwvKVS8DjG5w==} + /vue-component-type-helpers@1.8.15: + resolution: {integrity: sha512-RKiPRKW4BdwgmQ9vaNkHYKAThdTbgU4TOphVyyzqxRwsOJOoRIrb+vB49XLvs5CKPNrvxMXZMwPe5FyJCqFWyg==} dev: true /vue-demi@0.13.11(vue@3.3.4): @@ -20140,7 +20078,7 @@ packages: sharp: 0.31.3 dev: false - github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.4.4)(@storybook/components@7.4.3)(@storybook/core-events@7.4.4)(@storybook/manager-api@7.4.4)(@storybook/preview-api@7.4.4)(@storybook/theming@7.4.4)(@storybook/types@7.4.4)(react-dom@18.2.0)(react@18.2.0): + github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640(@storybook/blocks@7.4.4)(@storybook/components@7.4.4)(@storybook/core-events@7.4.4)(@storybook/manager-api@7.4.4)(@storybook/preview-api@7.4.4)(@storybook/theming@7.4.4)(@storybook/types@7.4.4)(react-dom@18.2.0)(react@18.2.0): resolution: {tarball: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640} id: github.com/misskey-dev/storybook-addon-misskey-theme/cf583db098365b2ccc81a82f63ca9c93bc32b640 name: storybook-addon-misskey-theme @@ -20162,7 +20100,7 @@ packages: optional: true dependencies: '@storybook/blocks': 7.4.4(react-dom@18.2.0)(react@18.2.0) - '@storybook/components': 7.4.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/components': 7.4.4(react-dom@18.2.0)(react@18.2.0) '@storybook/core-events': 7.4.4 '@storybook/manager-api': 7.4.4(react-dom@18.2.0)(react@18.2.0) '@storybook/preview-api': 7.4.4 diff --git a/scripts/build-assets.mjs b/scripts/build-assets.mjs index a8a2cafa5..d1bb8518b 100644 --- a/scripts/build-assets.mjs +++ b/scripts/build-assets.mjs @@ -18,7 +18,7 @@ async function copyFrontendFonts() { } async function copyFrontendTablerIcons() { - await fs.cp('./packages/frontend/node_modules/@tabler/icons-webfont', './built/_frontend_dist_/tabler-icons', { dereference: true, recursive: true }); + await fs.cp('./packages/frontend/node_modules/@phosphor-icons/web/src', './built/_frontend_dist_/phosphor-icons', { dereference: true, recursive: true }); } async function copyFrontendLocales() { From 7b179d3a92adb91e111aca111d7875bb99748002 Mon Sep 17 00:00:00 2001 From: Insert5StarName Date: Sat, 30 Sep 2023 21:53:52 +0200 Subject: [PATCH 05/24] work in progress icons --- .../backend/src/server/web/views/base.pug | 2 +- ...lugin-unwind-css-module-class-name.test.ts | 12 ++-- packages/frontend/src/account.ts | 6 +- .../src/components/MkAbuseReportWindow.vue | 2 +- .../src/components/MkAccountMoved.vue | 2 +- .../src/components/MkAnnouncementDialog.vue | 8 +-- .../src/components/MkChannelFollowButton.vue | 4 +- .../src/components/MkChannelPreview.vue | 6 +- .../frontend/src/components/MkClickerGame.vue | 2 +- .../frontend/src/components/MkContainer.vue | 4 +- .../src/components/MkDateSeparatedList.vue | 4 +- packages/frontend/src/components/MkDialog.vue | 12 ++-- .../frontend/src/components/MkDonation.vue | 2 +- .../src/components/MkDrive.folder.vue | 12 ++-- .../src/components/MkDrive.navFolder.vue | 2 +- packages/frontend/src/components/MkDrive.vue | 16 ++--- .../src/components/MkDriveFileThumbnail.vue | 18 +++--- .../src/components/MkEmojiPicker.section.vue | 2 +- .../frontend/src/components/MkEmojiPicker.vue | 10 +-- .../src/components/MkFoldableSection.vue | 4 +- packages/frontend/src/components/MkFolder.vue | 4 +- .../src/components/MkFollowButton.vue | 8 +-- packages/frontend/src/components/MkGoogle.vue | 2 +- packages/frontend/src/components/MkInfo.vue | 4 +- packages/frontend/src/components/MkInput.vue | 2 +- .../frontend/src/components/MkInviteCode.vue | 4 +- .../frontend/src/components/MkKeyValue.vue | 2 +- packages/frontend/src/components/MkLink.vue | 2 +- .../frontend/src/components/MkMediaBanner.vue | 4 +- .../frontend/src/components/MkMediaImage.vue | 16 ++--- .../frontend/src/components/MkMediaVideo.vue | 6 +- packages/frontend/src/components/MkMenu.vue | 2 +- .../frontend/src/components/MkModalWindow.vue | 6 +- packages/frontend/src/components/MkNote.vue | 52 ++++++++-------- .../src/components/MkNoteDetailed.vue | 58 ++++++++--------- .../frontend/src/components/MkNoteHeader.vue | 12 ++-- .../src/components/MkNotification.vue | 32 +++++----- .../frontend/src/components/MkPageWindow.vue | 6 +- .../src/components/MkPasswordDialog.vue | 6 +- packages/frontend/src/components/MkPoll.vue | 2 +- .../frontend/src/components/MkPollEditor.vue | 4 +- .../frontend/src/components/MkPostForm.vue | 44 ++++++------- .../src/components/MkPostFormAttaches.vue | 12 ++-- .../src/components/MkRemoteCaution.vue | 2 +- .../frontend/src/components/MkRolePreview.vue | 6 +- packages/frontend/src/components/MkSelect.vue | 4 +- packages/frontend/src/components/MkSignin.vue | 6 +- .../src/components/MkSignupDialog.form.vue | 54 ++++++++-------- .../src/components/MkSignupDialog.rules.vue | 12 ++-- .../src/components/MkSubNoteContent.vue | 2 +- packages/frontend/src/components/MkSwitch.vue | 2 +- .../frontend/src/components/MkTextarea.vue | 2 +- .../frontend/src/components/MkUrlPreview.vue | 4 +- .../MkUserAnnouncementEditDialog.vue | 12 ++-- .../frontend/src/components/MkUserPopup.vue | 2 +- .../components/MkUserSetupDialog.Privacy.vue | 8 +-- .../src/components/MkUserSetupDialog.User.vue | 4 +- .../src/components/MkUserSetupDialog.vue | 12 ++-- .../src/components/MkVisibilityPicker.vue | 8 +-- .../src/components/MkVisitorDashboard.vue | 8 +-- .../src/components/MkWaitingDialog.vue | 2 +- .../frontend/src/components/MkWidgets.vue | 8 +-- packages/frontend/src/components/MkWindow.vue | 2 +- .../frontend/src/components/form/link.vue | 4 +- .../frontend/src/components/form/suspense.vue | 4 +- .../frontend/src/components/global/MkA.vue | 6 +- .../frontend/src/components/global/MkAd.vue | 2 +- .../src/components/global/MkError.vue | 2 +- .../global/MkPageHeader.stories.impl.ts | 8 +-- .../frontend/src/components/global/MkUrl.vue | 2 +- packages/frontend/src/navbar.ts | 40 ++++++------ packages/frontend/src/pages/_error_.vue | 4 +- packages/frontend/src/pages/about-sharkey.vue | 4 +- packages/frontend/src/pages/about.emojis.vue | 2 +- .../frontend/src/pages/about.federation.vue | 2 +- packages/frontend/src/pages/about.vue | 6 +- packages/frontend/src/pages/achievements.vue | 2 +- packages/frontend/src/pages/admin-file.vue | 12 ++-- packages/frontend/src/pages/admin-user.vue | 40 ++++++------ .../src/pages/admin/RolesEditorFormula.vue | 4 +- packages/frontend/src/pages/admin/ads.vue | 8 +-- .../src/pages/admin/announcements.vue | 28 ++++----- .../src/pages/admin/bot-protection.vue | 14 ++--- .../frontend/src/pages/admin/branding.vue | 18 +++--- .../frontend/src/pages/admin/database.vue | 2 +- .../src/pages/admin/email-settings.vue | 6 +- .../frontend/src/pages/admin/federation.vue | 4 +- packages/frontend/src/pages/admin/files.vue | 6 +- packages/frontend/src/pages/admin/index.vue | 52 ++++++++-------- .../src/pages/admin/instance-block.vue | 4 +- packages/frontend/src/pages/admin/invites.vue | 4 +- .../frontend/src/pages/admin/moderation.vue | 6 +- packages/frontend/src/pages/admin/modlog.vue | 2 +- .../src/pages/admin/object-storage.vue | 8 +-- .../src/pages/admin/other-settings.vue | 4 +- .../src/pages/admin/overview.federation.vue | 4 +- .../src/pages/admin/overview.stats.vue | 8 +-- .../frontend/src/pages/admin/overview.vue | 2 +- .../frontend/src/pages/admin/queue.chart.vue | 2 +- packages/frontend/src/pages/admin/queue.vue | 6 +- packages/frontend/src/pages/admin/relays.vue | 12 ++-- .../frontend/src/pages/admin/roles.edit.vue | 6 +- .../frontend/src/pages/admin/roles.editor.vue | 8 +-- .../frontend/src/pages/admin/roles.role.vue | 18 +++--- packages/frontend/src/pages/admin/roles.vue | 6 +- .../frontend/src/pages/admin/security.vue | 12 ++-- .../frontend/src/pages/admin/server-rules.vue | 8 +-- .../frontend/src/pages/admin/settings.vue | 12 ++-- packages/frontend/src/pages/admin/users.vue | 8 +-- packages/frontend/src/pages/announcements.vue | 18 +++--- .../frontend/src/pages/antenna-timeline.vue | 4 +- packages/frontend/src/pages/api-console.vue | 2 +- packages/frontend/src/pages/auth.vue | 2 +- .../frontend/src/pages/channel-editor.vue | 16 ++--- packages/frontend/src/pages/channel.vue | 28 ++++----- packages/frontend/src/pages/channels.vue | 16 ++--- packages/frontend/src/pages/clicker.vue | 2 +- packages/frontend/src/pages/clip.vue | 12 ++-- .../src/pages/custom-emojis-manager.vue | 18 +++--- packages/frontend/src/pages/drive.vue | 2 +- .../frontend/src/pages/emoji-edit-dialog.vue | 10 +-- packages/frontend/src/pages/emojis.emoji.vue | 4 +- packages/frontend/src/pages/explore.users.vue | 8 +-- packages/frontend/src/pages/explore.vue | 8 +-- packages/frontend/src/pages/favorites.vue | 2 +- .../frontend/src/pages/flash/flash-edit.vue | 8 +-- .../frontend/src/pages/flash/flash-index.vue | 10 +-- packages/frontend/src/pages/flash/flash.vue | 16 ++--- .../frontend/src/pages/follow-requests.vue | 6 +- packages/frontend/src/pages/gallery/edit.vue | 14 ++--- packages/frontend/src/pages/gallery/index.vue | 14 ++--- packages/frontend/src/pages/gallery/post.vue | 16 ++--- packages/frontend/src/pages/instance-info.vue | 10 +-- packages/frontend/src/pages/invite.vue | 6 +- packages/frontend/src/pages/list.vue | 10 +-- packages/frontend/src/pages/miauth.vue | 2 +- .../frontend/src/pages/my-antennas/create.vue | 2 +- .../frontend/src/pages/my-antennas/edit.vue | 2 +- .../frontend/src/pages/my-antennas/editor.vue | 4 +- .../frontend/src/pages/my-antennas/index.vue | 6 +- .../frontend/src/pages/my-clips/index.vue | 10 +-- .../frontend/src/pages/my-lists/index.vue | 6 +- packages/frontend/src/pages/my-lists/list.vue | 6 +- packages/frontend/src/pages/not-found.vue | 2 +- packages/frontend/src/pages/note.vue | 4 +- packages/frontend/src/pages/notifications.vue | 12 ++-- packages/frontend/src/pages/oauth.vue | 2 +- .../page-editor/els/page-editor.el.image.vue | 4 +- .../els/page-editor.el.section.vue | 4 +- .../page-editor/page-editor.container.vue | 6 +- .../src/pages/page-editor/page-editor.vue | 18 +++--- packages/frontend/src/pages/page.vue | 14 ++--- packages/frontend/src/pages/pages.vue | 10 +-- packages/frontend/src/pages/registry.keys.vue | 2 +- .../frontend/src/pages/registry.value.vue | 6 +- packages/frontend/src/pages/registry.vue | 2 +- .../frontend/src/pages/reset-password.vue | 4 +- packages/frontend/src/pages/role.vue | 8 +-- packages/frontend/src/pages/search.note.vue | 2 +- packages/frontend/src/pages/search.user.vue | 2 +- packages/frontend/src/pages/search.vue | 6 +- .../src/pages/settings/2fa.qrdialog.vue | 2 +- packages/frontend/src/pages/settings/2fa.vue | 10 +-- .../frontend/src/pages/settings/accounts.vue | 8 +-- packages/frontend/src/pages/settings/api.vue | 2 +- packages/frontend/src/pages/settings/apps.vue | 2 +- .../src/pages/settings/custom-css.vue | 2 +- .../src/pages/settings/drive-cleaner.vue | 2 +- .../frontend/src/pages/settings/drive.vue | 4 +- .../frontend/src/pages/settings/email.vue | 6 +- .../frontend/src/pages/settings/general.vue | 10 +-- .../src/pages/settings/import-export.vue | 62 +++++++++---------- .../frontend/src/pages/settings/index.vue | 34 +++++----- .../src/pages/settings/instance-mute.vue | 4 +- .../frontend/src/pages/settings/migration.vue | 6 +- .../src/pages/settings/mute-block.vue | 20 +++--- .../frontend/src/pages/settings/navbar.vue | 10 +-- .../src/pages/settings/notifications.vue | 4 +- .../frontend/src/pages/settings/other.vue | 10 +-- .../src/pages/settings/plugin.install.vue | 4 +- .../frontend/src/pages/settings/plugin.vue | 10 +-- .../pages/settings/preferences-backups.vue | 12 ++-- .../frontend/src/pages/settings/privacy.vue | 2 +- .../frontend/src/pages/settings/profile.vue | 12 ++-- .../frontend/src/pages/settings/reaction.vue | 10 +-- .../frontend/src/pages/settings/roles.vue | 2 +- .../frontend/src/pages/settings/security.vue | 8 +-- .../src/pages/settings/sounds.sound.vue | 2 +- .../frontend/src/pages/settings/sounds.vue | 4 +- .../frontend/src/pages/settings/statusbar.vue | 2 +- .../src/pages/settings/theme.install.vue | 6 +- .../src/pages/settings/theme.manage.vue | 2 +- .../frontend/src/pages/settings/theme.vue | 4 +- .../src/pages/settings/webhook.edit.vue | 6 +- .../src/pages/settings/webhook.new.vue | 4 +- .../frontend/src/pages/settings/webhook.vue | 4 +- .../frontend/src/pages/settings/word-mute.vue | 2 +- packages/frontend/src/pages/share.vue | 2 +- .../frontend/src/pages/signup-complete.vue | 2 +- packages/frontend/src/pages/tag.vue | 4 +- packages/frontend/src/pages/theme-editor.vue | 6 +- .../frontend/src/pages/timeline.tutorial.vue | 8 +-- packages/frontend/src/pages/timeline.vue | 28 ++++----- .../frontend/src/pages/user-list-timeline.vue | 4 +- packages/frontend/src/pages/user-tag.vue | 2 +- packages/frontend/src/pages/user/activity.vue | 6 +- .../frontend/src/pages/user/followers.vue | 2 +- .../frontend/src/pages/user/following.vue | 2 +- packages/frontend/src/pages/user/home.vue | 16 ++--- .../src/pages/user/index.activity.vue | 2 +- .../frontend/src/pages/user/index.photos.vue | 2 +- packages/frontend/src/pages/user/index.vue | 16 ++--- packages/frontend/src/pages/welcome.setup.vue | 2 +- .../frontend/src/pages/welcome.timeline.vue | 2 +- .../src/scripts/get-drive-file-menu.ts | 18 +++--- .../frontend/src/scripts/get-note-menu.ts | 40 ++++++------ .../frontend/src/scripts/get-user-menu.ts | 30 ++++----- packages/frontend/src/scripts/select-file.ts | 6 +- packages/frontend/src/style.scss | 6 +- .../src/ui/_common_/announcements.vue | 8 +-- packages/frontend/src/ui/_common_/common.ts | 14 ++--- .../src/ui/_common_/navbar-for-mobile.vue | 8 +-- packages/frontend/src/ui/_common_/navbar.vue | 8 +-- .../src/ui/_common_/stream-indicator.vue | 2 +- packages/frontend/src/ui/classic.header.vue | 10 +-- packages/frontend/src/ui/classic.sidebar.vue | 10 +-- packages/frontend/src/ui/deck.vue | 14 ++--- .../frontend/src/ui/deck/antenna-column.vue | 6 +- .../frontend/src/ui/deck/channel-column.vue | 6 +- packages/frontend/src/ui/deck/column.vue | 10 +-- .../frontend/src/ui/deck/direct-column.vue | 2 +- packages/frontend/src/ui/deck/list-column.vue | 6 +- .../frontend/src/ui/deck/mentions-column.vue | 2 +- .../src/ui/deck/notifications-column.vue | 4 +- .../src/ui/deck/role-timeline-column.vue | 4 +- packages/frontend/src/ui/deck/tl-column.vue | 10 +-- .../frontend/src/ui/deck/widgets-column.vue | 4 +- packages/frontend/src/ui/universal.vue | 12 ++-- .../frontend/src/ui/universal.widgets.vue | 4 +- packages/frontend/src/ui/visitor.vue | 16 ++--- packages/frontend/src/ui/zen.vue | 2 +- .../frontend/src/widgets/WidgetClicker.vue | 2 +- .../frontend/src/widgets/WidgetFederation.vue | 2 +- .../frontend/src/widgets/WidgetJobQueue.vue | 4 +- .../src/widgets/WidgetNotifications.vue | 4 +- packages/frontend/src/widgets/WidgetRss.vue | 2 +- .../frontend/src/widgets/WidgetRssTicker.vue | 2 +- .../frontend/src/widgets/WidgetTimeline.vue | 28 ++++----- .../frontend/src/widgets/WidgetTrends.vue | 2 +- .../frontend/src/widgets/WidgetUserList.vue | 4 +- .../src/widgets/server-metric/disk.vue | 2 +- 251 files changed, 1062 insertions(+), 1062 deletions(-) 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..3c12b5473 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-usersta 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/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
- +
{{ tag.tag }} @@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + @@ -54,7 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + diff --git a/packages/frontend/src/pages/explore.vue b/packages/frontend/src/pages/explore.vue index fd846d979..58d7aca92 100644 --- a/packages/frontend/src/pages/explore.vue +++ b/packages/frontend/src/pages/explore.vue @@ -47,20 +47,20 @@ const headerActions = $computed(() => []); const headerTabs = $computed(() => [{ key: 'featured', - icon: 'ti ti-bolt', + icon: 'ph-lightning ph-bold pg-lg', title: i18n.ts.featured, }, { key: 'users', - icon: 'ti ti-users', + icon: 'ph-users ph-bold pg-lg', title: i18n.ts.users, }, { key: 'roles', - icon: 'ti ti-badges', + icon: 'ph-seal-check ph-bold pg-lg', title: i18n.ts.roles, }]); definePageMetadata(computed(() => ({ title: i18n.ts.explore, - icon: 'ti ti-hash', + icon: 'ph-hash ph-bold ph-lg', }))); diff --git a/packages/frontend/src/pages/favorites.vue b/packages/frontend/src/pages/favorites.vue index 63a0057b7..cb7390cf6 100644 --- a/packages/frontend/src/pages/favorites.vue +++ b/packages/frontend/src/pages/favorites.vue @@ -40,7 +40,7 @@ const pagination = { definePageMetadata({ title: i18n.ts.favorites, - icon: 'ti ti-star', + icon: 'ph-star ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue index f494218c1..ce25ad63a 100644 --- a/packages/frontend/src/pages/flash/flash-edit.vue +++ b/packages/frontend/src/pages/flash/flash-edit.vue @@ -14,14 +14,14 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.selectFromPresets }} + {{ i18n.ts.selectFromPresets }}
- {{ i18n.ts.save }} - {{ i18n.ts.show }} - {{ i18n.ts.delete }} + {{ i18n.ts.save }} + {{ i18n.ts.show }} + {{ i18n.ts.delete }}
diff --git a/packages/frontend/src/pages/flash/flash-index.vue b/packages/frontend/src/pages/flash/flash-index.vue index 4a686efd4..be81c72b7 100644 --- a/packages/frontend/src/pages/flash/flash-index.vue +++ b/packages/frontend/src/pages/flash/flash-index.vue @@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -68,7 +68,7 @@ function create() { } const headerActions = $computed(() => [{ - icon: 'ti ti-plus', + icon: 'ph-plus ph-bold ph-lg', text: i18n.ts.create, handler: create, }]); @@ -76,15 +76,15 @@ const headerActions = $computed(() => [{ const headerTabs = $computed(() => [{ key: 'featured', title: i18n.ts._play.featured, - icon: 'ti ti-flare', + icon: 'ph-fire ph-bold pg-lg', }, { key: 'my', title: i18n.ts._play.my, - icon: 'ti ti-edit', + icon: 'ph-pencil-line ph-bold pg-lg', }, { key: 'liked', title: i18n.ts._play.liked, - icon: 'ti ti-heart', + icon: 'ph-heart ph-bold ph-lg', }]); definePageMetadata(computed(() => ({ diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue index 32a835831..8bb293eeb 100644 --- a/packages/frontend/src/pages/flash/flash.vue +++ b/packages/frontend/src/pages/flash/flash.vue @@ -15,10 +15,10 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ flash.likedCount }} - {{ flash.likedCount }} - - + {{ flash.likedCount }} + {{ flash.likedCount }} + +
@@ -27,13 +27,13 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ flash.summary }}
Play
- {{ flash.likedCount }} + {{ flash.likedCount }}
- + @@ -41,8 +41,8 @@ SPDX-License-Identifier: AGPL-3.0-only
-
{{ i18n.ts.updatedAt }}:
-
{{ i18n.ts.createdAt }}:
+
{{ i18n.ts.updatedAt }}:
+
{{ i18n.ts.createdAt }}:
{{ i18n.ts._play.editThisPage }} diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue index 4f7fdef0b..02487bf0b 100644 --- a/packages/frontend/src/pages/follow-requests.vue +++ b/packages/frontend/src/pages/follow-requests.vue @@ -24,8 +24,8 @@ SPDX-License-Identifier: AGPL-3.0-only

@{{ acct(req.follower) }}

- {{ i18n.ts.accept }} - {{ i18n.ts.reject }} + {{ i18n.ts.accept }} + {{ i18n.ts.reject }}
@@ -71,7 +71,7 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => ({ title: i18n.ts.followRequests, - icon: 'ti ti-user-plus', + icon: 'ph-user-plus ph-bold ph-lg', }))); diff --git a/packages/frontend/src/pages/gallery/edit.vue b/packages/frontend/src/pages/gallery/edit.vue index f3cbd4947..0d43eee61 100644 --- a/packages/frontend/src/pages/gallery/edit.vue +++ b/packages/frontend/src/pages/gallery/edit.vue @@ -19,18 +19,18 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ file.name }}
- +
- {{ i18n.ts.attachFile }} + {{ i18n.ts.attachFile }}
{{ i18n.ts.markAsSensitive }}
- {{ i18n.ts.save }} - {{ i18n.ts.publish }} + {{ i18n.ts.save }} + {{ i18n.ts.publish }} - {{ i18n.ts.delete }} + {{ i18n.ts.delete }}
@@ -122,10 +122,10 @@ const headerTabs = $computed(() => []); definePageMetadata(computed(() => props.postId ? { title: i18n.ts.edit, - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', } : { title: i18n.ts.postToGallery, - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', })); diff --git a/packages/frontend/src/pages/gallery/index.vue b/packages/frontend/src/pages/gallery/index.vue index 43bb7c496..8584fdf38 100644 --- a/packages/frontend/src/pages/gallery/index.vue +++ b/packages/frontend/src/pages/gallery/index.vue @@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.postToGallery }} + {{ i18n.ts.postToGallery }}
@@ -97,7 +97,7 @@ watch(() => props.tag, () => { }); const headerActions = $computed(() => [{ - icon: 'ti ti-plus', + icon: 'ph-plus ph-bold ph-lg', text: i18n.ts.create, handler: () => { router.push('/gallery/new'); @@ -107,20 +107,20 @@ const headerActions = $computed(() => [{ const headerTabs = $computed(() => [{ key: 'explore', title: i18n.ts.gallery, - icon: 'ti ti-icons', + icon: 'ph-images-square ph-bold pg-lg', }, { key: 'liked', title: i18n.ts._gallery.liked, - icon: 'ti ti-heart', + icon: 'ph-heart ph-bold ph-lg', }, { key: 'my', title: i18n.ts._gallery.my, - icon: 'ti ti-edit', + icon: 'ph-pencil-line ph-bold pg-lg', }]); definePageMetadata({ title: i18n.ts.gallery, - icon: 'ti ti-icons', + icon: 'ph-images-square ph-bold pg-lg', }); diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue index 3f4f657e9..4de05644b 100644 --- a/packages/frontend/src/pages/gallery/post.vue +++ b/packages/frontend/src/pages/gallery/post.vue @@ -19,17 +19,17 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ post.title }}
- +
- - - + + +
@@ -43,7 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
@@ -146,7 +146,7 @@ function edit() { watch(() => props.postId, fetchPost, { immediate: true }); const headerActions = $computed(() => [{ - icon: 'ti ti-pencil', + icon: 'ph-pencil ph-bold ph-lg', text: i18n.ts.edit, handler: edit, }]); diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue index 2285e4c88..5d7937560 100644 --- a/packages/frontend/src/pages/instance-info.vue +++ b/packages/frontend/src/pages/instance-info.vue @@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.stopActivityDelivery }} {{ i18n.ts.blockThisInstance }} - Refresh metadata + Refresh metadata
@@ -203,7 +203,7 @@ fetch(); const headerActions = $computed(() => [{ text: `https://${props.host}`, - icon: 'ti ti-external-link', + icon: 'ph-arrow-square-out ph-bold ph-lg', handler: () => { window.open(`https://${props.host}`, '_blank'); }, @@ -212,7 +212,7 @@ const headerActions = $computed(() => [{ const headerTabs = $computed(() => [{ key: 'overview', title: i18n.ts.overview, - icon: 'ti ti-info-circle', + icon: 'ph-info ph-bold ph-lg', }, { key: 'chart', title: i18n.ts.charts, @@ -220,11 +220,11 @@ const headerTabs = $computed(() => [{ }, { key: 'users', title: i18n.ts.users, - icon: 'ti ti-users', + icon: 'ph-users ph-bold pg-lg', }, { key: 'raw', title: 'Raw', - icon: 'ti ti-code', + icon: 'ph-code ph-bold pg-lg', }]); definePageMetadata({ diff --git a/packages/frontend/src/pages/invite.vue b/packages/frontend/src/pages/invite.vue index b44b580e8..a72cf47b9 100644 --- a/packages/frontend/src/pages/invite.vue +++ b/packages/frontend/src/pages/invite.vue @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- + {{ i18n.ts.nothing }}
@@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.t('inviteLimitResetCycle', { time: resetCycle, limit: inviteLimit }) }}
- {{ i18n.ts.createInviteCode }} + {{ i18n.ts.createInviteCode }}
{{ i18n.t('createLimitRemaining', { limit: currentInviteLimit }) }}
@@ -94,7 +94,7 @@ update(); definePageMetadata({ title: i18n.ts.invite, - icon: 'ti ti-user-plus', + icon: 'ph-user-plus ph-bold ph-lg', }); diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue index db0b201b7..38f454de8 100644 --- a/packages/frontend/src/pages/list.vue +++ b/packages/frontend/src/pages/list.vue @@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only

- + {{ i18n.ts.nothing }}

@@ -26,9 +26,9 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ list.likedCount }} - {{ list.likedCount }} - {{ i18n.ts.import }} + {{ list.likedCount }} + {{ list.likedCount }} + {{ i18n.ts.import }} @@ -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/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue index bcd58ae51..3801d6b5d 100644 --- a/packages/frontend/src/components/MkButton.vue +++ b/packages/frontend/src/components/MkButton.vue @@ -154,7 +154,7 @@ function onMousedown(evt: MouseEvent): void { } &.rounded { - border-radius: 999px; + border-radius: 4px; } &.primary { @@ -264,7 +264,7 @@ function onMousedown(evt: MouseEvent): void { left: 0; width: 100%; height: 100%; - border-radius: 6px; + border-radius: 5px; overflow: clip; pointer-events: none; } diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue index ab91f793f..6429258f4 100644 --- a/packages/frontend/src/components/MkChannelPreview.vue +++ b/packages/frontend/src/components/MkChannelPreview.vue @@ -100,7 +100,7 @@ const bannerStyle = computed(() => { padding: 8px 12px; font-size: 80%; background: rgba(0, 0, 0, 0.7); - border-radius: 6px; + border-radius: 5px; color: #fff; } @@ -111,7 +111,7 @@ const bannerStyle = computed(() => { left: 16px; background: rgba(0, 0, 0, 0.7); color: var(--warn); - border-radius: 6px; + border-radius: 5px; font-weight: bold; font-size: 1em; padding: 4px 7px; diff --git a/packages/frontend/src/components/MkChartLegend.vue b/packages/frontend/src/components/MkChartLegend.vue index d321114cb..2e83d59b5 100644 --- a/packages/frontend/src/components/MkChartLegend.vue +++ b/packages/frontend/src/components/MkChartLegend.vue @@ -55,7 +55,7 @@ defineExpose({ font-size: 85%; padding: 4px 12px 4px 8px; border: solid 1px var(--divider); - border-radius: 999px; + border-radius: 4px; &:hover { border-color: var(--inputBorderHover); diff --git a/packages/frontend/src/components/MkColorInput.vue b/packages/frontend/src/components/MkColorInput.vue index 983a35103..4ebfec5b5 100644 --- a/packages/frontend/src/components/MkColorInput.vue +++ b/packages/frontend/src/components/MkColorInput.vue @@ -102,7 +102,7 @@ const onInput = (ev: KeyboardEvent) => { color: var(--fg); background: var(--panel); border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; outline: none; box-shadow: none; box-sizing: border-box; diff --git a/packages/frontend/src/components/MkContainer.vue b/packages/frontend/src/components/MkContainer.vue index 98580cdb9..f703db5eb 100644 --- a/packages/frontend/src/components/MkContainer.vue +++ b/packages/frontend/src/components/MkContainer.vue @@ -223,7 +223,7 @@ onUnmounted(() => { background: var(--panel); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 129ef6cf0..118852d71 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -196,7 +196,7 @@ onBeforeUnmount(() => { box-sizing: border-box; text-align: center; background: var(--panel); - border-radius: 16px; + border-radius: 4px; } .icon { diff --git a/packages/frontend/src/components/MkDrive.file.vue b/packages/frontend/src/components/MkDrive.file.vue index e3f96724d..530859bc0 100644 --- a/packages/frontend/src/components/MkDrive.file.vue +++ b/packages/frontend/src/components/MkDrive.file.vue @@ -100,7 +100,7 @@ function onDragend() { position: relative; padding: 8px 0 0 0; min-height: 180px; - border-radius: 8px; + border-radius: 5px; cursor: pointer; &:hover { diff --git a/packages/frontend/src/components/MkDriveFileThumbnail.vue b/packages/frontend/src/components/MkDriveFileThumbnail.vue index a44c78c24..66807cf42 100644 --- a/packages/frontend/src/components/MkDriveFileThumbnail.vue +++ b/packages/frontend/src/components/MkDriveFileThumbnail.vue @@ -63,7 +63,7 @@ const isThumbnailAvailable = computed(() => { position: relative; display: flex; background: var(--panel); - border-radius: 8px; + border-radius: 5px; overflow: clip; } diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue index 8ddb27a19..007c4b329 100644 --- a/packages/frontend/src/components/MkFolder.vue +++ b/packages/frontend/src/components/MkFolder.vue @@ -139,7 +139,7 @@ onMounted(() => { background: var(--buttonBg); -webkit-backdrop-filter: var(--blur, blur(15px)); backdrop-filter: var(--blur, blur(15px)); - border-radius: 6px; + border-radius: 5px; transition: border-radius 0.3s; &:hover { diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue index 327bd35d9..b203589af 100644 --- a/packages/frontend/src/components/MkInput.vue +++ b/packages/frontend/src/components/MkInput.vue @@ -221,7 +221,7 @@ defineExpose({ color: var(--fg); background: var(--panel); border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; outline: none; box-shadow: none; box-sizing: border-box; diff --git a/packages/frontend/src/components/MkInstanceCardMini.vue b/packages/frontend/src/components/MkInstanceCardMini.vue index de726e3aa..e514e2c6a 100644 --- a/packages/frontend/src/components/MkInstanceCardMini.vue +++ b/packages/frontend/src/components/MkInstanceCardMini.vue @@ -46,7 +46,7 @@ function getInstanceIcon(instance): string { align-items: center; padding: 16px; background: var(--panel); - border-radius: 8px; + border-radius: 5px; > :global(.icon) { display: block; diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue index 321acc0fb..8425c258a 100644 --- a/packages/frontend/src/components/MkLaunchPad.vue +++ b/packages/frontend/src/components/MkLaunchPad.vue @@ -74,7 +74,7 @@ function close() { overflow: auto; overscroll-behavior: contain; text-align: left; - border-radius: 16px; + border-radius: 4px; &.asDrawer { width: 100%; @@ -97,7 +97,7 @@ function close() { justify-content: center; vertical-align: bottom; height: 100px; - border-radius: 10px; + border-radius: 5px; &:hover { color: var(--accent); diff --git a/packages/frontend/src/components/MkMediaBanner.vue b/packages/frontend/src/components/MkMediaBanner.vue index 9392baac5..d04f0b453 100644 --- a/packages/frontend/src/components/MkMediaBanner.vue +++ b/packages/frontend/src/components/MkMediaBanner.vue @@ -82,7 +82,7 @@ onMounted(() => { } .audio { - border-radius: 8px; + border-radius: 5px; overflow: clip; } diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue index bf87aa9ff..016a4b020 100644 --- a/packages/frontend/src/components/MkMediaImage.vue +++ b/packages/frontend/src/components/MkMediaImage.vue @@ -157,7 +157,7 @@ function showMenu(ev: MouseEvent) { .hide { display: block; position: absolute; - border-radius: 6px; + border-radius: 5px; background-color: black; color: var(--accentLighten); font-size: 12px; @@ -187,7 +187,7 @@ function showMenu(ev: MouseEvent) { .menu { display: block; position: absolute; - border-radius: 999px; + border-radius: 4px; background-color: rgba(0, 0, 0, 0.3); -webkit-backdrop-filter: var(--blur, blur(15px)); backdrop-filter: var(--blur, blur(15px)); @@ -223,7 +223,7 @@ function showMenu(ev: MouseEvent) { .indicator { /* Hardcode to black because either --bg or --fg makes it hard to read in dark/light mode */ background-color: black; - border-radius: 6px; + border-radius: 5px; color: var(--accentLighten); display: inline-block; font-weight: bold; diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue index f134f2021..c9f02dd45 100644 --- a/packages/frontend/src/components/MkMediaList.vue +++ b/packages/frontend/src/components/MkMediaList.vue @@ -341,7 +341,7 @@ const previewable = (file: Misskey.entities.DriveFile): boolean => { .media { overflow: hidden; // clipにするとバグる - border-radius: 8px; + border-radius: 5px; } :global(.pswp) { diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue index 2c5c778ae..e4ddabaaf 100644 --- a/packages/frontend/src/components/MkMediaVideo.vue +++ b/packages/frontend/src/components/MkMediaVideo.vue @@ -68,7 +68,7 @@ const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.enab .hide { display: block; position: absolute; - border-radius: 6px; + border-radius: 5px; background-color: black; color: var(--accentLighten); font-size: 14px; @@ -118,7 +118,7 @@ const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.enab .indicator { /* Hardcode to black because either --bg or --fg makes it hard to read in dark/light mode */ background-color: black; - border-radius: 6px; + border-radius: 5px; color: var(--accentLighten); display: inline-block; font-weight: bold; diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue index ffc9ca3f4..e9cc9d5f4 100644 --- a/packages/frontend/src/components/MkMention.vue +++ b/packages/frontend/src/components/MkMention.vue @@ -43,7 +43,7 @@ const bgCss = bg.toRgbString(); .root { display: inline-block; padding: 4px 8px 4px 4px; - border-radius: 999px; + border-radius: 4px; color: var(--mention); &.isMe { diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 392876a2d..626698aa4 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -288,7 +288,7 @@ onBeforeUnmount(() => { margin: auto; width: calc(100% - 16px); height: 100%; - border-radius: 6px; + border-radius: 5px; } &:not(:disabled):hover { diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 85a1b4273..14dd7ad46 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -552,7 +552,7 @@ function readPromo() { padding: 0 4px; margin-bottom: 0 !important; background: var(--popup); - border-radius: 8px; + border-radius: 5px; box-shadow: 0px 4px 32px var(--shadow); } @@ -684,7 +684,7 @@ function readPromo() { left: 8px; width: 5px; height: calc(100% - 16px); - border-radius: 999px; + border-radius: 4px; pointer-events: none; } @@ -724,7 +724,7 @@ function readPromo() { background: var(--popup); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } @@ -754,7 +754,7 @@ function readPromo() { background: var(--panel); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } @@ -789,7 +789,7 @@ function readPromo() { .quoteNote { padding: 16px; border: dashed 1px var(--renote); - border-radius: 8px; + border-radius: 5px; overflow: clip; } diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index ec7841c39..73769b6a6 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -552,7 +552,7 @@ if (appearNote.reply && appearNote.reply.replyId && defaultStore.state.autoloadC width: 28px; height: 28px; margin: 0 8px 0 0; - border-radius: 6px; + border-radius: 5px; } .renoteText { @@ -679,7 +679,7 @@ if (appearNote.reply && appearNote.reply.replyId && defaultStore.state.autoloadC .quoteNote { padding: 16px; border: dashed 1px var(--renote); - border-radius: 8px; + border-radius: 5px; overflow: clip; } @@ -757,7 +757,7 @@ if (appearNote.reply && appearNote.reply.replyId && defaultStore.state.autoloadC .reactionTab { padding: 4px 6px; border: solid 1px var(--divider); - border-radius: 6px; + border-radius: 5px; } .reactionTabActive { diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index f8ef3f3fa..b7da548e9 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -50,7 +50,7 @@ const showContent = $ref(false); margin: 0 10px 0 0; width: 34px; height: 34px; - border-radius: 8px; + border-radius: 5px; position: sticky !important; top: calc(16px + var(--stickyTop, 0px)); left: 0; diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index 73f41e577..6e30ac484 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -278,7 +278,7 @@ if (props.detail) { left: 8px; width: 5px; height: calc(100% - 8px); - border-radius: 999px; + border-radius: 4px; pointer-events: none; } @@ -288,7 +288,7 @@ if (props.detail) { margin: 0 8px 0 0; width: 38px; height: 38px; - border-radius: 8px; + border-radius: 5px; } .body { @@ -362,6 +362,6 @@ if (props.detail) { padding: 8px !important; border: 1px solid var(--divider); margin: 8px 8px 0 8px; - border-radius: 8px; + border-radius: 5px; } diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index 694d48b3f..7e7694bf4 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -181,7 +181,7 @@ useTooltip(reactionRef, (showing) => { display: block; width: 100%; height: 100%; - border-radius: 6px; + border-radius: 5px; } .subIcon { diff --git a/packages/frontend/src/components/MkOmit.vue b/packages/frontend/src/components/MkOmit.vue index 8c113bd77..85202ff3c 100644 --- a/packages/frontend/src/components/MkOmit.vue +++ b/packages/frontend/src/components/MkOmit.vue @@ -69,7 +69,7 @@ onUnmounted(() => { background: var(--panel); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index f0228671b..1ec5b0d61 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -61,7 +61,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +
{{ i18n.ts.notSpecifiedMentionWarning }} - @@ -993,7 +993,7 @@ defineExpose({ padding: 0 12px; line-height: 34px; font-weight: bold; - border-radius: 6px; + border-radius: 5px; min-width: 90px; box-sizing: border-box; color: var(--fgOnAccent); @@ -1003,7 +1003,7 @@ defineExpose({ .headerRightItem { margin: 0; padding: 8px; - border-radius: 6px; + border-radius: 5px; &:hover { background: var(--X5); @@ -1066,7 +1066,7 @@ defineExpose({ .visibleUser { margin-right: 14px; padding: 8px 0 8px 8px; - border-radius: 8px; + border-radius: 5px; background: var(--X4); } @@ -1135,7 +1135,7 @@ defineExpose({ padding: 4px 6px; font-size: .9em; color: var(--warn); - border-radius: 6px; + border-radius: 5px; min-width: 1.6em; text-align: center; @@ -1175,7 +1175,7 @@ defineExpose({ font-size: 1em; width: auto; height: 100%; - border-radius: 6px; + border-radius: 5px; &:hover { background: var(--X5); diff --git a/packages/frontend/src/components/MkRadio.vue b/packages/frontend/src/components/MkRadio.vue index c4df3e991..e0eca18ed 100644 --- a/packages/frontend/src/components/MkRadio.vue +++ b/packages/frontend/src/components/MkRadio.vue @@ -55,7 +55,7 @@ function toggle(): void { background-color: var(--panel); background-clip: padding-box !important; border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; font-size: 90%; transition: all 0.2s; user-select: none; diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue index 2cfc27cee..03d8da439 100644 --- a/packages/frontend/src/components/MkRange.vue +++ b/packages/frontend/src/components/MkRange.vue @@ -181,7 +181,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => { padding: 7px 12px; background: var(--panel); border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; > .container { position: relative; @@ -197,7 +197,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => { width: calc(100% - #{$thumbWidth}); height: 3px; background: rgba(0, 0, 0, 0.1); - border-radius: 999px; + border-radius: 4px; overflow: clip; > .highlight { @@ -228,7 +228,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => { height: 3px; margin-left: - math.div($tickWidth, 2); background: var(--divider); - border-radius: 999px; + border-radius: 4px; } } @@ -238,7 +238,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => { height: $thumbHeight; cursor: grab; background: var(--accent); - border-radius: 999px; + border-radius: 4px; &:hover { background: var(--accentLighten); diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index d0db51521..03c91e2ba 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -119,7 +119,7 @@ useTooltip(buttonEl, async (showing) => { margin: 2px; padding: 0 6px; font-size: 1.5em; - border-radius: 6px; + border-radius: 5px; &.canToggle { background: var(--buttonBg); @@ -147,7 +147,7 @@ useTooltip(buttonEl, async (showing) => { &.large { height: 52px; font-size: 2em; - border-radius: 8px; + border-radius: 5px; > .count { font-size: 0.6em; diff --git a/packages/frontend/src/components/MkSelect.vue b/packages/frontend/src/components/MkSelect.vue index f7b9e5828..83563587e 100644 --- a/packages/frontend/src/components/MkSelect.vue +++ b/packages/frontend/src/components/MkSelect.vue @@ -241,7 +241,7 @@ function show(ev: MouseEvent) { color: var(--fg); background: var(--panel); border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; outline: none; box-shadow: none; box-sizing: border-box; diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index c45cb3ebe..c58107bd1 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -165,7 +165,7 @@ async function updateAgreeNote(v: boolean) { font-weight: bold; align-items: center; justify-content: center; - border-radius: 999px; + border-radius: 4px; } } diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index a0559e719..021dc0d86 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -78,7 +78,7 @@ const collapsed = $ref(isLong); background: var(--panel); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } @@ -114,7 +114,7 @@ const collapsed = $ref(isLong); background: var(--popup); padding: 6px 10px; font-size: 0.8em; - border-radius: 999px; + border-radius: 4px; box-shadow: 0 2px 6px rgb(0 0 0 / 20%); } diff --git a/packages/frontend/src/components/MkSuperMenu.vue b/packages/frontend/src/components/MkSuperMenu.vue index efd566539..f5af32782 100644 --- a/packages/frontend/src/components/MkSuperMenu.vue +++ b/packages/frontend/src/components/MkSuperMenu.vue @@ -59,7 +59,7 @@ defineProps<{ width: 100%; box-sizing: border-box; padding: 9px 16px 9px 8px; - border-radius: 9px; + border-radius: 5px; font-size: 0.9em; &:hover { diff --git a/packages/frontend/src/components/MkSwitch.button.vue b/packages/frontend/src/components/MkSwitch.button.vue index a7e91acc3..9d2010336 100644 --- a/packages/frontend/src/components/MkSwitch.button.vue +++ b/packages/frontend/src/components/MkSwitch.button.vue @@ -52,7 +52,7 @@ const toggle = () => { background: var(--switchOffBg); background-clip: content-box; border: solid 1px var(--switchOffBg); - border-radius: 999px; + border-radius: 4px; cursor: pointer; transition: inherit; user-select: none; @@ -72,7 +72,7 @@ const toggle = () => { top: 3px; width: 15px; height: 15px; - border-radius: 999px; + border-radius: 4px; transition: all 0.2s ease; &:not(.knobChecked) { diff --git a/packages/frontend/src/components/MkTab.vue b/packages/frontend/src/components/MkTab.vue index 9785d8940..2b93d2eb4 100644 --- a/packages/frontend/src/components/MkTab.vue +++ b/packages/frontend/src/components/MkTab.vue @@ -39,7 +39,7 @@ export default defineComponent({ > button { flex: 1; padding: 10px 8px; - border-radius: 999px; + border-radius: 4px; &:disabled { opacity: 1 !important; diff --git a/packages/frontend/src/components/MkTextarea.vue b/packages/frontend/src/components/MkTextarea.vue index 9893c91fb..036ad3b9e 100644 --- a/packages/frontend/src/components/MkTextarea.vue +++ b/packages/frontend/src/components/MkTextarea.vue @@ -153,7 +153,7 @@ onMounted(() => { color: var(--fg); background: var(--panel); border: solid 1px var(--panel); - border-radius: 6px; + border-radius: 5px; outline: none; box-shadow: none; box-sizing: border-box; diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue index 48908cf3e..78eccd061 100644 --- a/packages/frontend/src/components/MkToast.vue +++ b/packages/frontend/src/components/MkToast.vue @@ -66,7 +66,7 @@ onMounted(() => { max-width: calc(100% - 32px); width: min-content; box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3); - border-radius: 8px; + border-radius: 5px; overflow: clip; text-align: center; pointer-events: none; diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index f38e914b2..9cec4009c 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -231,7 +231,7 @@ onUnmounted(() => { display: block; font-size: 14px; box-shadow: 0 0 0 1px var(--divider); - border-radius: 8px; + border-radius: 5px; overflow: clip; &:hover { diff --git a/packages/frontend/src/components/MkUserCardMini.vue b/packages/frontend/src/components/MkUserCardMini.vue index fbc2e09b0..465a10988 100644 --- a/packages/frontend/src/components/MkUserCardMini.vue +++ b/packages/frontend/src/components/MkUserCardMini.vue @@ -50,7 +50,7 @@ onMounted(() => { align-items: center; padding: 16px; background: var(--panel); - border-radius: 8px; + border-radius: 5px; > :global(.avatar) { display: block; diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue index c13ef60f3..6bb2fc895 100644 --- a/packages/frontend/src/components/MkUserInfo.vue +++ b/packages/frontend/src/components/MkUserInfo.vue @@ -100,7 +100,7 @@ defineProps<{ color: #fff; background: rgba(0, 0, 0, 0.7); font-size: 0.7em; - border-radius: 6px; + border-radius: 5px; } .description { diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue index ae4a64123..da75bbc1c 100644 --- a/packages/frontend/src/components/MkUserPopup.vue +++ b/packages/frontend/src/components/MkUserPopup.vue @@ -145,7 +145,7 @@ onMounted(() => { color: #fff; background: rgba(0, 0, 0, 0.7); font-size: 0.7em; - border-radius: 6px; + border-radius: 5px; } .avatarBack { @@ -226,7 +226,7 @@ onMounted(() => { right: 44px; padding: 6px; background: var(--panel); - border-radius: 999px; + border-radius: 4px; } .follow { diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index f91d8db40..fd491db92 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -151,7 +151,7 @@ function exploreOtherServers() { right: 16px; width: 32px; height: 32px; - border-radius: 8px; + border-radius: 5px; font-size: 18px; } diff --git a/packages/frontend/src/components/form/link.vue b/packages/frontend/src/components/form/link.vue index 9df41eb00..365ce6de6 100644 --- a/packages/frontend/src/components/form/link.vue +++ b/packages/frontend/src/components/form/link.vue @@ -52,7 +52,7 @@ const props = defineProps<{ box-sizing: border-box; padding: 10px 14px; background: var(--buttonBg); - border-radius: 6px; + border-radius: 5px; font-size: 0.9em; &:hover { diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue index 27c25b949..3b07ac110 100644 --- a/packages/frontend/src/components/global/MkAvatar.vue +++ b/packages/frontend/src/components/global/MkAvatar.vue @@ -142,10 +142,10 @@ watch(() => props.user.avatarBlurhash, () => { } .square { - border-radius: 20%; + border-radius: 5px; > .inner { - border-radius: 20%; + border-radius: 5px; } } diff --git a/packages/frontend/src/components/global/MkError.vue b/packages/frontend/src/components/global/MkError.vue index 0df8fa3b8..efb7b75fb 100644 --- a/packages/frontend/src/components/global/MkError.vue +++ b/packages/frontend/src/components/global/MkError.vue @@ -44,6 +44,6 @@ const emit = defineEmits<{ width: 128px; height: 128px; margin-bottom: 16px; - border-radius: 16px; + border-radius: 4px; } diff --git a/packages/frontend/src/components/global/MkPageHeader.tabs.vue b/packages/frontend/src/components/global/MkPageHeader.tabs.vue index e62967963..57e41ed06 100644 --- a/packages/frontend/src/components/global/MkPageHeader.tabs.vue +++ b/packages/frontend/src/components/global/MkPageHeader.tabs.vue @@ -242,7 +242,7 @@ onUnmounted(() => { bottom: 0; height: 3px; background: var(--accent); - border-radius: 999px; + border-radius: 4px; transition: none; pointer-events: none; diff --git a/packages/frontend/src/pages/_error_.vue b/packages/frontend/src/pages/_error_.vue index 4977cece4..037d6c94a 100644 --- a/packages/frontend/src/pages/_error_.vue +++ b/packages/frontend/src/pages/_error_.vue @@ -82,6 +82,6 @@ definePageMetadata({ vertical-align: bottom; height: 128px; margin-bottom: 24px; - border-radius: 16px; + border-radius: 4px; } diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index dee4680be..85047584d 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -206,7 +206,7 @@ definePageMetadata({ display: block; width: 80px; margin: 0 auto; - border-radius: 16px; + border-radius: 4px; position: relative; z-index: 1; } @@ -256,7 +256,7 @@ definePageMetadata({ align-items: center; padding: 12px; background: var(--buttonBg); - border-radius: 6px; + border-radius: 5px; &:hover { text-decoration: none; @@ -289,7 +289,7 @@ definePageMetadata({ align-items: center; padding: 12px; background: var(--buttonBg); - border-radius: 6px; + border-radius: 5px; } .patronIcon { diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 14c35997b..23b8e20b9 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -164,7 +164,7 @@ definePageMetadata(computed(() => ({ diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue index 503fb2af9..6b619249d 100644 --- a/packages/frontend/src/pages/admin/_header_.vue +++ b/packages/frontend/src/pages/admin/_header_.vue @@ -286,7 +286,7 @@ onUnmounted(() => { bottom: 0; height: 3px; background: var(--accent); - border-radius: 999px; + border-radius: 4px; transition: all 0.2s ease; pointer-events: none; } diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index 18b1a2ab6..ab4394eac 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -344,7 +344,7 @@ defineExpose({ display: block; margin: auto; height: 42px; - border-radius: 8px; + border-radius: 5px; } } } diff --git a/packages/frontend/src/pages/admin/modlog.ModLog.vue b/packages/frontend/src/pages/admin/modlog.ModLog.vue index 8d83b32fa..761a5b702 100644 --- a/packages/frontend/src/pages/admin/modlog.ModLog.vue +++ b/packages/frontend/src/pages/admin/modlog.ModLog.vue @@ -111,7 +111,7 @@ const props = defineProps<{ .diff { background: #fff; color: #000; - border-radius: 6px; + border-radius: 5px; overflow: clip; } diff --git a/packages/frontend/src/pages/admin/overview.federation.vue b/packages/frontend/src/pages/admin/overview.federation.vue index 8705af169..16bf6985e 100644 --- a/packages/frontend/src/pages/admin/overview.federation.vue +++ b/packages/frontend/src/pages/admin/overview.federation.vue @@ -146,7 +146,7 @@ onMounted(async () => { margin-right: 12px; background: var(--accentedBg); color: var(--accent); - border-radius: 10px; + border-radius: 5px; } &.sub { diff --git a/packages/frontend/src/pages/admin/overview.stats.vue b/packages/frontend/src/pages/admin/overview.stats.vue index 59b5540ea..580bfb780 100644 --- a/packages/frontend/src/pages/admin/overview.stats.vue +++ b/packages/frontend/src/pages/admin/overview.stats.vue @@ -115,7 +115,7 @@ onMounted(async () => { margin-right: 12px; background: var(--accentedBg); color: var(--accent); - border-radius: 10px; + border-radius: 5px; } &.users { diff --git a/packages/frontend/src/pages/admin/server-rules.vue b/packages/frontend/src/pages/admin/server-rules.vue index bf9c6b0f4..af1caa87c 100644 --- a/packages/frontend/src/pages/admin/server-rules.vue +++ b/packages/frontend/src/pages/admin/server-rules.vue @@ -104,7 +104,7 @@ definePageMetadata({ height: 28px; align-items: center; justify-content: center; - border-radius: 999px; + border-radius: 4px; margin-right: 8px; } @@ -119,7 +119,7 @@ definePageMetadata({ height: 40px; color: var(--error); margin-left: auto; - border-radius: 6px; + border-radius: 5px; &:hover { background: var(--X5); diff --git a/packages/frontend/src/pages/channel.vue b/packages/frontend/src/pages/channel.vue index 7348ceb98..ef7b1c0d7 100644 --- a/packages/frontend/src/pages/channel.vue +++ b/packages/frontend/src/pages/channel.vue @@ -268,7 +268,7 @@ definePageMetadata(computed(() => channel ? { padding: 8px 12px; font-size: 80%; background: rgba(0, 0, 0, 0.7); - border-radius: 6px; + border-radius: 5px; color: #fff; } @@ -283,7 +283,7 @@ definePageMetadata(computed(() => channel ? { left: 16px; background: rgba(0, 0, 0, 0.7); color: var(--warn); - border-radius: 6px; + border-radius: 5px; font-weight: bold; font-size: 1em; padding: 4px 7px; diff --git a/packages/frontend/src/pages/emoji-edit-dialog.vue b/packages/frontend/src/pages/emoji-edit-dialog.vue index f54e395bb..b9dd3e6e8 100644 --- a/packages/frontend/src/pages/emoji-edit-dialog.vue +++ b/packages/frontend/src/pages/emoji-edit-dialog.vue @@ -206,7 +206,7 @@ async function del() { .imgContainer { padding: 8px; - border-radius: 6px; + border-radius: 5px; } .img { diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue index fce652b59..210a0fcf8 100644 --- a/packages/frontend/src/pages/emojis.emoji.vue +++ b/packages/frontend/src/pages/emojis.emoji.vue @@ -61,7 +61,7 @@ function menu(ev) { padding: 12px; text-align: left; background: var(--panel); - border-radius: 8px; + border-radius: 5px; &:hover { border-color: var(--accent); diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue index 02487bf0b..1686718f2 100644 --- a/packages/frontend/src/pages/follow-requests.vue +++ b/packages/frontend/src/pages/follow-requests.vue @@ -87,7 +87,7 @@ definePageMetadata(computed(() => ({ margin: 0 12px 0 0; width: 42px; height: 42px; - border-radius: 8px; + border-radius: 5px; } > .body { diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue index bd0206537..b4d2fcf0d 100644 --- a/packages/frontend/src/pages/instance-info.vue +++ b/packages/frontend/src/pages/instance-info.vue @@ -242,7 +242,7 @@ definePageMetadata({ display: block; margin: 0 16px 0 0; height: 64px; - border-radius: 8px; + border-radius: 5px; } > .name { diff --git a/packages/frontend/src/pages/invite.vue b/packages/frontend/src/pages/invite.vue index a72cf47b9..2c0ed4145 100644 --- a/packages/frontend/src/pages/invite.vue +++ b/packages/frontend/src/pages/invite.vue @@ -114,6 +114,6 @@ definePageMetadata({ width: 128px; height: 128px; margin-bottom: 16px; - border-radius: 16px; + border-radius: 4px; } diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue index 38f454de8..9309ebc08 100644 --- a/packages/frontend/src/pages/list.vue +++ b/packages/frontend/src/pages/list.vue @@ -141,7 +141,7 @@ definePageMetadata(computed(() => list ? { width: 128px; height: 128px; margin-bottom: 16px; - border-radius: 16px; + border-radius: 4px; } .button { diff --git a/packages/frontend/src/pages/my-antennas/index.vue b/packages/frontend/src/pages/my-antennas/index.vue index 74b596126..b1d92e42e 100644 --- a/packages/frontend/src/pages/my-antennas/index.vue +++ b/packages/frontend/src/pages/my-antennas/index.vue @@ -74,7 +74,7 @@ onActivated(() => { display: block; padding: 16px; border: solid 1px var(--divider); - border-radius: 6px; + border-radius: 5px; &:hover { border: solid 1px var(--accent); diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue index c637e1ea2..01cd0d8aa 100644 --- a/packages/frontend/src/pages/my-lists/index.vue +++ b/packages/frontend/src/pages/my-lists/index.vue @@ -84,7 +84,7 @@ onActivated(() => { display: block; padding: 16px; border: solid 1px var(--divider); - border-radius: 6px; + border-radius: 5px; margin-bottom: 8px; &:hover { diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue index e3a0e2630..1de610e28 100644 --- a/packages/frontend/src/pages/note.vue +++ b/packages/frontend/src/pages/note.vue @@ -141,7 +141,7 @@ definePageMetadata(computed(() => note ? { .loadPrev { min-width: 0; margin: 0 auto; - border-radius: 999px; + border-radius: 4px; } .loadNext { diff --git a/packages/frontend/src/pages/page-editor/page-editor.container.vue b/packages/frontend/src/pages/page-editor/page-editor.container.vue index 9ea7d7fd1..cb0af1d54 100644 --- a/packages/frontend/src/pages/page-editor/page-editor.container.vue +++ b/packages/frontend/src/pages/page-editor/page-editor.container.vue @@ -63,7 +63,7 @@ function remove() { overflow: hidden; background: var(--panel); border: solid 2px var(--X12); - border-radius: 8px; + border-radius: 5px; &:hover { border: solid 2px var(--X13); diff --git a/packages/frontend/src/pages/role.vue b/packages/frontend/src/pages/role.vue index 35b5d5af4..ec5820387 100644 --- a/packages/frontend/src/pages/role.vue +++ b/packages/frontend/src/pages/role.vue @@ -104,7 +104,7 @@ definePageMetadata(computed(() => ({ width: 128px; height: 128px; margin-bottom: 16px; - border-radius: 16px; + border-radius: 4px; } diff --git a/packages/frontend/src/pages/settings/apps.vue b/packages/frontend/src/pages/settings/apps.vue index ad7201896..c06db2724 100644 --- a/packages/frontend/src/pages/settings/apps.vue +++ b/packages/frontend/src/pages/settings/apps.vue @@ -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/drive-cleaner.vue b/packages/frontend/src/pages/settings/drive-cleaner.vue index d86b664cf..791d76d1b 100644 --- a/packages/frontend/src/pages/settings/drive-cleaner.vue +++ b/packages/frontend/src/pages/settings/drive-cleaner.vue @@ -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 95b4406ed..0c6effbaa 100644 --- a/packages/frontend/src/pages/settings/drive.vue +++ b/packages/frontend/src/pages/settings/drive.vue @@ -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/profile.vue b/packages/frontend/src/pages/settings/profile.vue index d016e5709..b6377d8b9 100644 --- a/packages/frontend/src/pages/settings/profile.vue +++ b/packages/frontend/src/pages/settings/profile.vue @@ -267,7 +267,7 @@ definePageMetadata({ background-size: cover; background-position: center; border: solid 1px var(--divider); - border-radius: 10px; + border-radius: 5px; overflow: clip; } diff --git a/packages/frontend/src/pages/settings/reaction.vue b/packages/frontend/src/pages/settings/reaction.vue index 83ed4ab60..12d37c9da 100644 --- a/packages/frontend/src/pages/settings/reaction.vue +++ b/packages/frontend/src/pages/settings/reaction.vue @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+