From 63a92b53f101aa6d2e6c90d83779756158934397 Mon Sep 17 00:00:00 2001 From: Mathias Jakobsen Date: Thu, 21 Aug 2025 11:51:38 +0100 Subject: [PATCH] Merge pull request #28017 from overleaf/revert-28016-revert-27953-mj-editor-color-scheme Reinstate "[web] Specify CSS color-scheme based on editor theme" GitOrigin-RevId: a6ac8e5a352c3c795725290584a2edfa236e2baa --- .../web/frontend/js/features/history/extensions/theme.ts | 3 +++ .../frontend/js/features/source-editor/extensions/theme.ts | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/services/web/frontend/js/features/history/extensions/theme.ts b/services/web/frontend/js/features/history/extensions/theme.ts index 8ddf312748..effc968140 100644 --- a/services/web/frontend/js/features/history/extensions/theme.ts +++ b/services/web/frontend/js/features/history/extensions/theme.ts @@ -46,6 +46,9 @@ const createThemeFromOptions = ({ } const baseTheme = EditorView.theme({ + '&.cm-editor.cm-editor': { + colorScheme: 'light', + }, '.cm-content': { fontSize: 'var(--font-size)', fontFamily: 'var(--source-font-family)', diff --git a/services/web/frontend/js/features/source-editor/extensions/theme.ts b/services/web/frontend/js/features/source-editor/extensions/theme.ts index 7b0d78f73c..fb82a45644 100644 --- a/services/web/frontend/js/features/source-editor/extensions/theme.ts +++ b/services/web/frontend/js/features/source-editor/extensions/theme.ts @@ -92,6 +92,12 @@ const createThemeFromOptions = ({ * Base styles that can have &dark and &light variants */ const baseTheme = EditorView.baseTheme({ + '&light.cm-editor': { + colorScheme: 'light', + }, + '&dark.cm-editor': { + colorScheme: 'dark', + }, '.cm-content': { fontSize: 'var(--font-size)', fontFamily: 'var(--source-font-family)',