diff --git a/locales/index.d.ts b/locales/index.d.ts index 6e3edefabb..e4bf6628cc 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1060,6 +1060,7 @@ export interface Locale { "rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn": string; "cancelReactionConfirm": string; "changeReactionConfirm": string; + "goToMisskey": string; "_initialAccountSetting": { "accountCreated": string; "letsStartAccountSetup": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 374eeba390..4f400ab60a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1057,6 +1057,7 @@ rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "ロールの指定が一 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "ロールは公開ロールである必要があります。" cancelReactionConfirm: "リアクションを取り消しますか?" changeReactionConfirm: "リアクションを変更しますか?" +goToMisskey: "Misskeyへ" _initialAccountSetting: accountCreated: "アカウントの作成が完了しました!" diff --git a/packages/frontend/src/pages/share.vue b/packages/frontend/src/pages/share.vue index 5c10198f7a..e0ac899230 100644 --- a/packages/frontend/src/pages/share.vue +++ b/packages/frontend/src/pages/share.vue @@ -16,7 +16,10 @@ class="_panel" @posted="state = 'posted'" /> - {{ i18n.ts.close }} +
+ {{ i18n.ts.close }} + {{ i18n.ts.goToMisskey }} +
@@ -148,10 +151,14 @@ function close(): void { // 閉じなければ100ms後タイムラインに window.setTimeout(() => { - mainRouter.push('/'); + location.href = '/'; }, 100); } +function goToMisskey(): void { + location.href = '/'; +} + const headerActions = $computed(() => []); const headerTabs = $computed(() => []); @@ -161,9 +168,3 @@ definePageMetadata({ icon: 'ti ti-share', }); - - diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5 index a23d25e866..b8820bcf86 100644 --- a/packages/frontend/src/themes/_dark.json5 +++ b/packages/frontend/src/themes/_dark.json5 @@ -77,7 +77,7 @@ codeString: '#ffb675', codeNumber: '#cfff9e', codeBoolean: '#c59eff', - deckDivider: '#000', + deckBg: '#000', htmlThemeColor: '@bg', X2: ':darken<2<@panel', X3: 'rgba(255, 255, 255, 0.05)', diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5 index 713756221a..da3c770555 100644 --- a/packages/frontend/src/themes/_light.json5 +++ b/packages/frontend/src/themes/_light.json5 @@ -77,7 +77,7 @@ codeString: '#b98710', codeNumber: '#0fbbbb', codeBoolean: '#62b70c', - deckDivider: ':darken<3<@bg', + deckBg: ':darken<3<@bg', htmlThemeColor: '@bg', X2: ':darken<2<@panel', X3: 'rgba(0, 0, 0, 0.05)', diff --git a/packages/frontend/src/themes/d-u0.json5 b/packages/frontend/src/themes/d-u0.json5 index b270f809ac..3fce93b2fe 100644 --- a/packages/frontend/src/themes/d-u0.json5 +++ b/packages/frontend/src/themes/d-u0.json5 @@ -83,6 +83,6 @@ fgTransparentWeak: ':alpha<0.75<@fg', panelHeaderDivider: 'rgba(0, 0, 0, 0)', scrollbarHandleHover: 'rgba(255, 255, 255, 0.4)', - deckDivider: '#142022', + deckBg: '#142022', }, } diff --git a/packages/frontend/src/ui/_common_/statusbars.vue b/packages/frontend/src/ui/_common_/statusbars.vue index b1e2c80f10..bb245c7dd8 100644 --- a/packages/frontend/src/ui/_common_/statusbars.vue +++ b/packages/frontend/src/ui/_common_/statusbars.vue @@ -1,18 +1,18 @@ @@ -25,67 +25,67 @@ const XFederation = defineAsyncComponent(() => import('./statusbar-federation.vu const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue')); - diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue index b91d6d7675..69637b6555 100644 --- a/packages/frontend/src/ui/deck.vue +++ b/packages/frontend/src/ui/deck.vue @@ -4,7 +4,7 @@
-
+
.section:first-of-type { - margin-left: auto; + margin-left: auto !important; } > .section:last-of-type { - margin-right: auto; + margin-right: auto !important; } } @@ -327,14 +328,16 @@ async function deleteProfile() { flex-direction: column; scroll-snap-align: start; flex-shrink: 0; - border-right: solid var(--deckDividerThickness) var(--deckDivider); + margin-top: var(--columnGap); + margin-bottom: var(--columnGap); + margin-right: var(--columnGap); &:first-of-type { - border-left: solid var(--deckDividerThickness) var(--deckDivider); + margin-left: var(--columnGap); } > .column:not(:last-of-type) { - border-bottom: solid var(--deckDividerThickness) var(--deckDivider); + margin-bottom: var(--columnGap); } } diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue index e2c651beca..073b036cb9 100644 --- a/packages/frontend/src/ui/deck/column.vue +++ b/packages/frontend/src/ui/deck/column.vue @@ -13,6 +13,12 @@ @dragend="onDragend" @contextmenu.prevent.stop="onContextmenu" > + + + + + +