From e74f16782bc8f6667a8efe64951b1fb54f322a70 Mon Sep 17 00:00:00 2001 From: miteruzo Date: Mon, 6 Jul 2026 22:39:53 +0900 Subject: [PATCH] #34 --- .../users/BehaviourSettingsSection.tsx | 33 ++--------- .../users/KeyboardSettingsSection.tsx | 8 +-- frontend/src/pages/users/SettingPage.tsx | 56 ++++--------------- 3 files changed, 19 insertions(+), 78 deletions(-) diff --git a/frontend/src/components/users/BehaviourSettingsSection.tsx b/frontend/src/components/users/BehaviourSettingsSection.tsx index b983f54..d5208a1 100644 --- a/frontend/src/components/users/BehaviourSettingsSection.tsx +++ b/frontend/src/components/users/BehaviourSettingsSection.tsx @@ -47,7 +47,7 @@ const embedAutoLoadOptions: SegmentedOption[] = [ const linkPreloadOptions: SegmentedOption[] = [ { value: 'off', label: 'しない' }, - { value: 'intent', label: 'マウスを置いたら' }] + { value: 'intent', label: 'する' }] const tagRelationDisplayOptions: SegmentedOption[] = [ { value: 'flat', label: 'まとめない' }, @@ -90,7 +90,7 @@ const SegmentedControl = ( const SettingBlock: FC = ( { title, description, children }, ) => ( -
+

{title}

{description}

@@ -149,10 +149,6 @@ const BehaviourSettingsSection: FC = (

動作

- {hasUnsavedChanges && ( -

- 未保存の変更があります -

)}
@@ -173,50 +169,33 @@ const BehaviourSettingsSection: FC = (
- + updateDraft ('animation', value)}/> - + updateDraft ('linkPreload', value)}/> - + updateDraft ('tagRelationDisplay', value)}/> - + updateDraft ('embedAutoLoad', value)}/> - - - updateDraft ('thumbnailMode', value)}/> -
) } diff --git a/frontend/src/components/users/KeyboardSettingsSection.tsx b/frontend/src/components/users/KeyboardSettingsSection.tsx index eaf8a15..dc56cf6 100644 --- a/frontend/src/components/users/KeyboardSettingsSection.tsx +++ b/frontend/src/components/users/KeyboardSettingsSection.tsx @@ -147,10 +147,6 @@ const KeyboardSettingsSection: FC = (

キーボード

- {hasUnsavedChanges && ( -

- 未保存の変更があります -

)}
@@ -206,8 +202,8 @@ const KeyboardSettingsSection: FC = ( 操作 適用範囲 現在のキー - 変更 - 既定に戻す + + 競合状態 diff --git a/frontend/src/pages/users/SettingPage.tsx b/frontend/src/pages/users/SettingPage.tsx index de45233..fa809e4 100644 --- a/frontend/src/pages/users/SettingPage.tsx +++ b/frontend/src/pages/users/SettingPage.tsx @@ -152,7 +152,7 @@ const themeSlotNoSelections: ThemeSegmentedOption[] = [ { value: 3, label: '3' } ] const sectionClassName = - 'space-y-4 rounded-xl border border-border bg-background/80 p-4' + 'space-y-4 rounded-xl p-4' const themeSelections: ThemeSelectionItem[] = [ { id: 'user:light:1', label: 'ライト 1', baseTheme: 'light', slotNo: 1 }, @@ -517,16 +517,6 @@ const ThemeSection: FC = (

テーマ

-

- 現在表示中: {displayedThemeLabel} -

- {draftThemeMode === 'system' && ( -

- システム設定: {systemThemeLabel} -

)} -

- 保存先: {themeLabelBySelection (currentDisplayedThemeSlot)} -

{hasUnsavedChanges && (

未保存の変更があります @@ -534,6 +524,13 @@ const ThemeSection: FC = (

+ + -
- -
- -
{themeTokenGroups.map (group => (
+ className="space-y-3 rounded-xl p-4">

{group.title}

{group.fields.map (field => ( @@ -657,7 +623,7 @@ const ThemeSection: FC = (
))} -
+

タグ