feat(desktop): reorganize theme settings and filter system theme choices by MicoinSmith · Pull Request #5737 · marktext/marktext · GitHub
Skip to content

feat(desktop): reorganize theme settings and filter system theme choices - #5737

Merged
Jocs merged 2 commits into
marktext:developfrom
MicoinSmith:feat/theme-settings-ui
Oct 14, 2026
Merged

feat(desktop): reorganize theme settings and filter system theme choices#5737
Jocs merged 2 commits into
marktext:developfrom
MicoinSmith:feat/theme-settings-ui

Conversation

@MicoinSmith

@MicoinSmith MicoinSmith commented Oct 13, 2026 •
edited by Jocs
Loading

Copy link
Copy Markdown
Contributor

Closes #5731

Summary

Move the follow-system toggle and light/dark theme pickers above the theme previews, with a localized note explaining why manual theme selection is disabled while following the system.

Restrict the light-mode picker to light themes and the dark-mode picker to dark themes using the shared isDarkThemeId classification. Both pickers previously offered every theme, allowing a dark theme to be selected for light mode and vice versa.

Use the existing --tableBorderColor for the 1px preference separator. No new theme color variables or aliases are introduced.

Validation

  • pnpm run lint — passed (existing warnings only).
  • pnpm run typecheck — passed.
  • Related theme unit tests — 22 passed across 3 spec files.
  • Checked the filtered lists: 10 light themes and 23 dark themes.
  • Regenerated locale bundles and verified followSystemNote in all 12 source and compiled locales.
  • Started the macOS development app for manual review.

Screenshots

5737-theme-settings.png

5737-theme-follow-system.png

Screenshots show the layout; they predate the separator color reuse and filtering of light/dark picker options.

@MicoinSmith MicoinSmith mentioned this pull request Oct 13, 2026
Closed
@MicoinSmith
feat(desktop): rework theme settings layout and add editorColor07
cb08284 
Groups the follow-system toggle and the light/dark pickers at the top
with a note explaining the locked theme list, and adds the
--editorColor07 theme variable to the default theme and all bundles.

Closes marktext#5731
@Jocs

Jocs commented Oct 13, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

@MicoinSmith
MicoinSmith force-pushed the feat/theme-settings-ui branch from 5b4c238 to cb08284 Compare October 13, 2026 10:49
@MicoinSmith

MicoinSmith commented Oct 13, 2026

Copy link
Copy Markdown
Contributor Author

Thanks. On the separator colour:

The preference separator was 2px of --editorColor04 — visually too heavy. Reducing it to 1px with the same --editorColor04 (#f7f7f7) is too faint to read as a divider. --editorColor07 (#eeeeee) sits between --editorColor04 and --editorColor10, so a 1px line stays visible without going as dark as --editorColor10. It has to be defined per theme because the value adapts (light themes ≈ #eee, dark themes rgba(255, 255, 255, 0.07)).

--editor-color-07 (the kebab alias) isn't referenced anywhere — I added it only to keep the alias block (--editor-color-04/10/30/…) consistent. I can drop those lines if you'd rather not carry an unused alias.

If you'd prefer not to add a variable at all, I'm happy to reuse the existing --tableBorderColor (light #e5e5e5 / dark #363839) for the separator instead — it's close to 07 and already used as the divider colour elsewhere in the preferences. Your call.

Conflicts: already resolved — the branch is rebased on the latest develop.

@Jocs

Jocs commented Oct 13, 2026

Copy link
Copy Markdown
Member

@Jocs Jocs changed the title feat(desktop): rework theme settings layout and add editorColor07 feat(desktop): reorganize theme settings and filter system theme choices Oct 14, 2026
@Jocs
Jocs merged commit 4beaff4 into marktext:develop Oct 14, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Jocs Jocs Jocs approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Feature] Reorganise the theme settings and add an editorColor07 variable

2 participants

@MicoinSmith @Jocs