From e8c2e70667ede2ea6bfe852302ce2942ac8b1101 Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih Date: Mon, 30 Oct 2023 18:22:56 +0900 Subject: [PATCH 1/3] fix merging --- packages/frontend/src/pages/timeline.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue index fce415d37e..1000e21df4 100644 --- a/packages/frontend/src/pages/timeline.vue +++ b/packages/frontend/src/pages/timeline.vue @@ -33,7 +33,7 @@ SPDX-License-Identifier: AGPL-3.0-only + + diff --git a/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue new file mode 100644 index 0000000000..659fd7c0fc --- /dev/null +++ b/packages/frontend/src/components/MkTutorialDialog.Sensitive.vue @@ -0,0 +1,156 @@ + + + + + + + diff --git a/packages/frontend/src/components/MkUserSetupDialog.TimelineTutorial.vue b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue similarity index 85% rename from packages/frontend/src/components/MkUserSetupDialog.TimelineTutorial.vue rename to packages/frontend/src/components/MkTutorialDialog.Timeline.vue index a9be4a5991..75b917f33c 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.TimelineTutorial.vue +++ b/packages/frontend/src/components/MkTutorialDialog.Timeline.vue @@ -12,7 +12,12 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._timelines.social }} … {{ i18n.ts._initialTutorial._timeline.social }}
{{ i18n.ts._timelines.global }} … {{ i18n.ts._initialTutorial._timeline.global }}
- +
+
{{ i18n.ts._initialTutorial._timeline.description2 }}
+ +
+
+ @@ -37,6 +42,11 @@ import { i18n } from '@/i18n.js'; background: var(--divider); } +.image { + max-width: 300px; + margin: 0 auto; +} + .post { position: relative; display: block; diff --git a/packages/frontend/src/components/MkTutorialDialog.vue b/packages/frontend/src/components/MkTutorialDialog.vue new file mode 100644 index 0000000000..54ffb0911e --- /dev/null +++ b/packages/frontend/src/components/MkTutorialDialog.vue @@ -0,0 +1,252 @@ + + + + + + + diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue index 0dc0af5853..05b55f77a7 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.vue @@ -16,14 +16,11 @@ SPDX-License-Identifier: AGPL-3.0-only - - - - +
-
+
{{ i18n.ts._initialAccountSetting.initialAccountSettingCompleted }}
{{ i18n.t('_initialAccountSetting.youCanContinueTutorial', { name: instance.name ?? host }) }}
- {{ i18n.ts._initialAccountSetting.startTutorial }} + {{ i18n.ts._initialAccountSetting.startTutorial }}
{{ i18n.ts.goBack }} - {{ i18n.ts.close }} -
-
- - - - - - - diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index 689e28330c..9ffa5b95b5 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -102,9 +102,7 @@ export function openInstanceMenu(ev: MouseEvent) { text: i18n.ts._initialTutorial.launchTutorial, icon: 'ti ti-presentation', action: () => { - os.popup(defineAsyncComponent(() => import('@/components/MkUserSetupDialog.vue')), { - onlyTutorial: true, - }, {}, 'closed'); + os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {}, 'closed'); }, } : undefined, { type: 'link', From 4ade8a58ca3262b62476cd39e2bac524450556eb Mon Sep 17 00:00:00 2001 From: kakkokari-gtyih Date: Mon, 30 Oct 2023 22:59:24 +0900 Subject: [PATCH 3/3] remove unnecessary file --- .../tutorial/syuilo_nattoopen_failed.webp:Zone.Identifier | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 packages/frontend/assets/tutorial/syuilo_nattoopen_failed.webp:Zone.Identifier diff --git a/packages/frontend/assets/tutorial/syuilo_nattoopen_failed.webp:Zone.Identifier b/packages/frontend/assets/tutorial/syuilo_nattoopen_failed.webp:Zone.Identifier deleted file mode 100644 index 88438ad86f..0000000000 --- a/packages/frontend/assets/tutorial/syuilo_nattoopen_failed.webp:Zone.Identifier +++ /dev/null @@ -1,4 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=https://s3.arkjp.net/emoji/syuilo_nattoopen_failed.png -HostUrl=https://s3.arkjp.net/emoji/syuilo_nattoopen_failed.png