-
-
{{ i18n.ts._profile.metadataEdit }}
-
-
-
-
-
- {{ i18n.ts.registeredDate }}
- {{ dateString(report.targetUser.createdAt) }} (
-
-
-
-
- ;
+
+export const Theme = {
+ render(args) {
+ return {
+ components: {
+ MkExtensionInstaller,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: ';
diff --git a/packages/frontend/src/components/MkExtensionInstaller.vue b/packages/frontend/src/components/MkExtensionInstaller.vue
new file mode 100644
index 000000000000..0f7acd69e723
--- /dev/null
+++ b/packages/frontend/src/components/MkExtensionInstaller.vue
@@ -0,0 +1,146 @@
+
+
+
+
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 9e6cd04365aa..19c5d892de25 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -46,14 +46,17 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
+
+
+
+
-
+
-
diff --git a/packages/frontend/src/components/MkExtensionInstaller.stories.impl.ts b/packages/frontend/src/components/MkExtensionInstaller.stories.impl.ts
new file mode 100644
index 000000000000..6763f7c54692
--- /dev/null
+++ b/packages/frontend/src/components/MkExtensionInstaller.stories.impl.ts
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { StoryObj } from '@storybook/vue3';
+import MkExtensionInstaller from './MkExtensionInstaller.vue';
+import lightTheme from '@@/themes/_light.json5';
+
+export const Plugin = {
+ render(args) {
+ return {
+ components: {
+ MkExtensionInstaller,
+ },
+ setup() {
+ return {
+ args,
+ };
+ },
+ computed: {
+ props() {
+ return {
+ ...this.args,
+ };
+ },
+ },
+ template: '-
{{ i18n.ts.reporter }}: @{{ report.reporter.username }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts.details }}
+
+
+
+
+
+
+
+ {{ i18n.ts.moderationNote }}
+ {{ moderationNote.length > 0 ? '...' : i18n.ts.none }}
+
+
-
+
+
+
+
+
+
+
+ {{ i18n.ts.moderationNoteDescription }}
+
+
+
{{ i18n.ts.moderator }}:
-
-
- {{ i18n.ts.forwardReport }}
- {{ i18n.ts.forwardReportIsAnonymous }}
-
- {{ i18n.ts.abuseMarkAsResolved }}
-
+ {{ i18n.ts._plugin.installWarn }}
+
+ {{ i18n.ts._externalResourceInstaller[`_${extension.type}`].metaTitle }}
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue
index a5f3069d4515..8262ae5d0ca3 100644
--- a/packages/frontend/src/components/MkFolder.vue
+++ b/packages/frontend/src/components/MkFolder.vue
@@ -38,9 +38,12 @@ SPDX-License-Identifier: AGPL-3.0-only
>
+
+
+
+
+
+ {{ i18n.ts._externalResourceInstaller[`_${extension.type}`].title }}
+{{ i18n.ts._externalResourceInstaller.checkVendorBeforeInstall }}
+
+
+
+ {{ i18n.ts.name }}
+ {{ extension.meta.name }}
+
+
+ {{ i18n.ts.author }}
+ {{ extension.meta.author }}
+
+
+
+ {{ i18n.ts.description }}
+ {{ extension.meta.description ?? i18n.ts.none }}
+
+
+ {{ i18n.ts.version }}
+ {{ extension.meta.version }}
+
+
+ {{ i18n.ts.permission }}
+
+
+
+ {{ i18n.ts._externalResourceInstaller._meta.base }}
+ {{ i18n.ts[extension.meta.base ?? 'none'] }}
+
+
+
+ {{ i18n.ts._plugin.viewSource }}
+
+
+
+ -
+
- {{ i18n.ts._permissions[permission] }} +
-
+
+
+
![]()
@{{ username }}
@@ -16,7 +16,6 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
diff --git a/packages/frontend/src/components/MkSignin.passkey.vue b/packages/frontend/src/components/MkSignin.passkey.vue
new file mode 100644
index 000000000000..0d68955fab97
--- /dev/null
+++ b/packages/frontend/src/components/MkSignin.passkey.vue
@@ -0,0 +1,92 @@
+
+
+
+
@@ -54,7 +60,6 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 7d16740a3e68..96a95f163586 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue
index 9d9661e8166f..71bd5addfb42 100644
--- a/packages/frontend/src/components/MkMention.vue
+++ b/packages/frontend/src/components/MkMention.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSignin.password.vue b/packages/frontend/src/components/MkSignin.password.vue
new file mode 100644
index 000000000000..2d79e2aeb155
--- /dev/null
+++ b/packages/frontend/src/components/MkSignin.password.vue
@@ -0,0 +1,181 @@
+
+
+
+
+ {{ i18n.ts.retry }}
+
+ {{ i18n.ts.useTotp }}
+
+
+
+
+
+
+
+ {{ i18n.ts.useSecurityKey }}
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSignin.totp.vue b/packages/frontend/src/components/MkSignin.totp.vue
new file mode 100644
index 000000000000..880c08315ea4
--- /dev/null
+++ b/packages/frontend/src/components/MkSignin.totp.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue
index 7942a84d66f3..26e1ac516c6c 100644
--- a/packages/frontend/src/components/MkSignin.vue
+++ b/packages/frontend/src/components/MkSignin.vue
@@ -4,239 +4,288 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
+
+
+
+
+
+
+
+
+ {{ i18n.ts['2fa'] }}
+
-
- {{ i18n.ts.add }}
- {{ i18n.ts.delete }}
- {{ i18n.ts.rearrange }}
- {{ i18n.ts.save }}
+
+
+
+
+
+ {{ i18n.ts._profile.verifiedLinkDescription }}
-
+
-
- {{ i18n.ts._profile.metadataLabel }}
+
-
- {{ i18n.ts._profile.metadataContent }}
+
-
- {{ i18n.ts._profile.verifiedLinkDescription }}
{{ i18n.ts._profile.metadataDescription }}
@@ -310,19 +309,11 @@ definePageMetadata(() => ({
container-type: inline-size;
}
-.metadataMargin {
- margin-bottom: 1.5em;
-}
-
.fieldDragItem {
display: flex;
- padding-bottom: .75em;
+ padding: 10px;
align-items: flex-end;
- border-bottom: solid 0.5px var(--divider);
-
- &:last-child {
- border-bottom: 0;
- }
+ border-radius: 6px;
/* (drag button) 32px + (drag button margin) 8px + (input width) 200px * 2 + (input gap) 12px = 452px */
@container (max-width: 452px) {
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index ae8ac88361e3..111df4112795 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -48,9 +48,10 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
-
+
@@ -63,6 +64,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.moderationNote }}
+ {{ i18n.ts.moderationNoteDescription }}
{{ i18n.ts.addModerationNote }}
@@ -158,15 +160,16 @@ SPDX-License-Identifier: AGPL-3.0-only