From c88957c037fb0305e05a19c1eceeca70bd4aee7e Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Wed, 25 Sep 2024 09:39:12 +0900 Subject: [PATCH 01/11] :art: --- packages/frontend/src/components/MkMenu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 52cbc5152e..0d794d84d5 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -438,7 +438,7 @@ onBeforeUnmount(() => { } } - &.big { + &.big:not(.asDrawer) { > .item { padding: 6px 20px; font-size: 1em; From 53682f5cc6fd76ec325aff771459a5d42a1cd559 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:31:04 +0900 Subject: [PATCH 02/11] :art: --- locales/index.d.ts | 12 +- locales/ja-JP.yml | 4 +- packages/frontend/src/components/MkMenu.vue | 113 ++++++++++-------- packages/frontend/src/components/MkModal.vue | 2 +- .../frontend/src/pages/settings/general.vue | 26 ++-- .../pages/settings/preferences-backups.vue | 4 +- packages/frontend/src/store.ts | 10 +- 7 files changed, 102 insertions(+), 69 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 2a27eb3e15..f379fe7c40 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -2053,9 +2053,17 @@ export interface Locale extends ILocale { */ "native": string; /** - * メニューをドロワーで表示しない + * メニューのスタイル */ - "disableDrawer": string; + "menuStyle": string; + /** + * ドロワー + */ + "drawer": string; + /** + * ポップアップ + */ + "popup": string; /** * ノートのアクションをホバー時のみ表示する */ diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 80cd8dc7cc..25af266c0b 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -509,7 +509,9 @@ uiLanguage: "UIの表示言語" aboutX: "{x}について" emojiStyle: "絵文字のスタイル" native: "ネイティブ" -disableDrawer: "メニューをドロワーで表示しない" +menuStyle: "メニューのスタイル" +drawer: "ドロワー" +popup: "ポップアップ" showNoteActionsOnlyHover: "ノートのアクションをホバー時のみ表示する" showReactionsCount: "ノートのリアクション数を表示する" noHistory: "履歴はありません" diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 0d794d84d5..890b99fcc2 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -4,18 +4,22 @@ SPDX-License-Identifier: AGPL-3.0-only --> - - - - - - - @@ -132,11 +125,18 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.squareAvatars }} {{ i18n.ts.showAvatarDecorations }} {{ i18n.ts.useSystemFont }} - {{ i18n.ts.disableDrawer }} {{ i18n.ts.forceShowAds }} {{ i18n.ts.seasonalScreenEffect }} {{ i18n.ts.useNativeUIForVideoAudioPlayer }} + + + + + + + +
@@ -225,6 +225,12 @@ SPDX-License-Identifier: AGPL-3.0-only
+ + + + + +
@@ -244,6 +250,7 @@ SPDX-License-Identifier: AGPL-3.0-only