From a814395127aa1b4ea643fb40235e3e58c747b77f Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sun, 16 Mar 2025 17:21:20 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"enhance(frontend):=20=E6=8A=95?= =?UTF-8?q?=E7=A8=BF=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E6=94=B9?= =?UTF-8?q?=E8=89=AF=20(#14804)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ce6b2448ced1101a4f0f8eeeb0d48378d40f696a. --- CHANGELOG.md | 3 - locales/index.d.ts | 4 - locales/ja-JP.yml | 1 - packages/frontend/src/components/MkMenu.vue | 333 +++++++++--------- .../frontend/src/components/MkPostForm.vue | 53 +-- .../src/components/MkPostFormOtherMenu.vue | 128 ------- packages/frontend/src/filters/number.ts | 2 +- packages/frontend/src/style.scss | 4 - 8 files changed, 168 insertions(+), 360 deletions(-) delete mode 100644 packages/frontend/src/components/MkPostFormOtherMenu.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8027b050..b6fcbba1b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,6 @@ - Enhance: CWの注釈テキストが入力されていない場合, Postボタンを非アクティブに - Enhance: CWを無効にした場合, 注釈テキストが最大入力文字数を超えていても投稿できるように - Enhance: テーマ設定画面のデザインを改善 -- Enhance: 投稿フォームの設定メニューを改良 - - 投稿フォームをリセットできるように - - 文字数カウントを復活 - Fix: テーマ切り替え時に一部の色が変わらない問題を修正 ### Server diff --git a/locales/index.d.ts b/locales/index.d.ts index 0c6e73aac4..f58a9bdf58 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5350,10 +5350,6 @@ export interface Locale extends ILocale { * 投稿フォーム */ "postForm": string; - /** - * 文字数 - */ - "textCount": string; "_emojiPalette": { /** * パレット diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d6af72ab57..c794083756 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1333,7 +1333,6 @@ preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル" paste: "ペースト" emojiPalette: "絵文字パレット" postForm: "投稿フォーム" -textCount: "文字数" _emojiPalette: palettes: "パレット" diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 954cfa58be..aa53c19c33 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -15,6 +15,9 @@ SPDX-License-Identifier: AGPL-3.0-only @focusin.passive.stop="() => {}" >
{}" @contextmenu.self.prevent="() => {}" > - -
- - - {{ i18n.ts.none }} + + + {{ i18n.ts.none }} +
@@ -435,7 +429,7 @@ onBeforeUnmount(() => { .root { &.center { > .menu { - .item { + > .item { text-align: center; } } @@ -445,7 +439,7 @@ onBeforeUnmount(() => { > .menu { min-width: 230px; - .item { + > .item { padding: 6px 20px; font-size: 0.95em; line-height: 24px; @@ -458,38 +452,36 @@ onBeforeUnmount(() => { margin: auto; > .menu { + padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0; width: 100%; border-radius: 24px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - > .menuItems { - padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0; + > .item { + font-size: 1em; + padding: 12px 24px; - > .item { - font-size: 1em; - padding: 12px 24px; - - &::before { - width: calc(100% - 24px); - border-radius: 12px; - } - - > .icon { - margin-right: 14px; - width: 24px; - } + &::before { + width: calc(100% - 24px); + border-radius: 12px; } - > .divider { - margin: 12px 0; + > .icon { + margin-right: 14px; + width: 24px; } } + + > .divider { + margin: 12px 0; + } } } } .menu { + padding: 8px 0; box-sizing: border-box; max-width: 100vw; min-width: 200px; @@ -501,11 +493,6 @@ onBeforeUnmount(() => { } } -.menuItems { - padding: 8px 0; - box-sizing: border-box; -} - .item { display: flex; align-items: center; diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index e31c33149f..d57300f647 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- - +