From cc1df1976be3593c93cdcd28b9b4fba6cb23a6ec Mon Sep 17 00:00:00 2001 From: bircni Date: Sun, 28 Jun 2026 20:29:34 +0200 Subject: [PATCH] fix: codemirror regressions (#38248) --- web_src/css/easymde.css | 27 +++++++------------------- web_src/css/modules/codeeditor.css | 31 ++++++------------------------ 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/web_src/css/easymde.css b/web_src/css/easymde.css index 9de6a1d431..0d513cb8e2 100644 --- a/web_src/css/easymde.css +++ b/web_src/css/easymde.css @@ -441,25 +441,12 @@ padding: 5px; } -.EasyMDEContainer .CodeMirror .cm-keyword { color: var(--color-syntax-keyword); } -.EasyMDEContainer .CodeMirror .cm-atom { color: var(--color-syntax-keyword); } -.EasyMDEContainer .CodeMirror .cm-number { color: var(--color-syntax-number); } -.EasyMDEContainer .CodeMirror .cm-def { color: var(--color-syntax-name); } -.EasyMDEContainer .CodeMirror .cm-variable-2 { color: var(--color-syntax-name); } -.EasyMDEContainer .CodeMirror .cm-variable-3 { color: var(--color-syntax-type); } -.EasyMDEContainer .CodeMirror .cm-property { color: var(--color-syntax-name); } -.EasyMDEContainer .CodeMirror .cm-comment { color: var(--color-syntax-comment); } -.EasyMDEContainer .CodeMirror .cm-string { color: var(--color-syntax-string); } -.EasyMDEContainer .CodeMirror .cm-string-2 { color: var(--color-syntax-regexp); } -.EasyMDEContainer .CodeMirror .cm-meta { color: var(--color-syntax-control); } -.EasyMDEContainer .CodeMirror .cm-qualifier { color: var(--color-syntax-control); } -.EasyMDEContainer .CodeMirror .cm-builtin { color: var(--color-syntax-keyword); } -.EasyMDEContainer .CodeMirror .cm-bracket { color: var(--color-syntax-operator); } -.EasyMDEContainer .CodeMirror .cm-tag { color: var(--color-syntax-type); } .EasyMDEContainer .CodeMirror .cm-attribute { color: var(--color-syntax-name); } -.EasyMDEContainer .CodeMirror .cm-header { color: var(--color-syntax-type); } -.EasyMDEContainer .CodeMirror .cm-quote { color: var(--color-syntax-comment); } -.EasyMDEContainer .CodeMirror .cm-hr { color: var(--color-syntax-operator); } -.EasyMDEContainer .CodeMirror .cm-url { color: var(--color-syntax-link); } -.EasyMDEContainer .CodeMirror .cm-link { color: var(--color-syntax-link); } +.EasyMDEContainer .CodeMirror .cm-bracket { color: var(--color-syntax-operator); } +.EasyMDEContainer .CodeMirror .cm-comment { color: var(--color-syntax-comment); } .EasyMDEContainer .CodeMirror .cm-error { color: var(--color-syntax-invalid); } +.EasyMDEContainer .CodeMirror .cm-hr { color: var(--color-syntax-operator); } +.EasyMDEContainer .CodeMirror .cm-link { color: var(--color-syntax-link); } +.EasyMDEContainer .CodeMirror .cm-quote { color: var(--color-syntax-comment); } +.EasyMDEContainer .CodeMirror .cm-tag { color: var(--color-syntax-type); } +.EasyMDEContainer .CodeMirror .cm-url { color: var(--color-syntax-link); } diff --git a/web_src/css/modules/codeeditor.css b/web_src/css/modules/codeeditor.css index 3212c04c83..d4be96845b 100644 --- a/web_src/css/modules/codeeditor.css +++ b/web_src/css/modules/codeeditor.css @@ -17,6 +17,11 @@ border: 1px solid var(--color-secondary); } +.code-editor-container { + position: relative; + min-height: 90vh; +} + /* editor layout */ .code-editor-container .cm-editor { color: var(--color-text); @@ -24,8 +29,6 @@ font-family: var(--fonts-monospace); font-size: 12px; max-height: 90vh; - flex: 1; - min-height: 0; } .code-editor-container .cm-editor, @@ -33,20 +36,8 @@ border-radius: 0 0 var(--border-radius) var(--border-radius); } -.code-editor-container .cm-scroller { - overflow: auto; - line-height: var(--line-height-code); - flex: 1; - min-height: 0; -} - .code-editor-container .cm-content { - align-self: stretch; - padding: 0; -} - -.code-editor-container .cm-content * { - caret-color: inherit; + caret-color: var(--color-caret); } .code-editor-container .cm-cursor, @@ -54,10 +45,6 @@ border-left-color: var(--color-caret); } -.code-editor-container .cm-editor.cm-focused { - outline: none; -} - .code-editor-container .cm-editor.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .code-editor-container .cm-selectionBackground { background-color: var(--color-primary-alpha-30); @@ -336,12 +323,6 @@ } /* command palette */ -.code-editor-container { - position: relative; - min-height: 90vh; - display: flex; - flex-direction: column; -} .cm-command-palette { position: absolute;