From da41714c50b4354a2674946b84403eae03f47ed5 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 5 May 2021 20:14:04 +0200 Subject: [PATCH] Add caret styling CSS (#15651) * Add caret styling CSS Fixes: https://github.com/go-gitea/gitea/issues/15644 * add rule in arc-green as well * grammar * Update web_src/less/themes/theme-arc-green.less Co-authored-by: Wim * remove extra rule * add comment Co-authored-by: zeripath Co-authored-by: Wim Co-authored-by: techknowlogick --- web_src/less/_base.less | 10 ++++++---- web_src/less/_editor.less | 4 ---- web_src/less/themes/theme-arc-green.less | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index bba378dde2..7e563d2f23 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -112,6 +112,7 @@ --color-placeholder-text: #aaa; --color-editor-line-highlight: var(--color-primary-light-6); --color-project-board-bg: var(--color-secondary-light-4); + --color-caret: var(--color-text-dark); /* backgrounds */ --checkbox-mask-checked: url('data:image/svg+xml;utf8,'); --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,'); @@ -161,15 +162,12 @@ table { border-collapse: collapse; } -/* firefox scroll bars */ - * { scrollbar-width: thin; scrollbar-color: var(--color-primary) transparent; + caret-color: var(--color-caret); } -/* webkit scrollbars */ - ::-webkit-scrollbar { width: 10px; } @@ -188,6 +186,10 @@ table { background: transparent; } +.CodeMirror-cursor { + border-color: var(--color-caret) !important; +} + ::selection, .CodeMirror-selected { background: var(--color-primary-light-1) !important; diff --git a/web_src/less/_editor.less b/web_src/less/_editor.less index 156430af0e..b785189dbb 100644 --- a/web_src/less/_editor.less +++ b/web_src/less/_editor.less @@ -4,10 +4,6 @@ border-color: var(--color-secondary); font: 14px var(--fonts-monospace); - .CodeMirror-cursor { - border-left: 1px solid var(--color-input-text); - } - &.cm-s-default { border-radius: 3px; padding: 0 !important; diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 7b4d676f8f..346a6e85ea 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -108,6 +108,7 @@ --color-placeholder-text: #6a737d; --color-editor-line-highlight: var(--color-primary-light-5); --color-project-board-bg: var(--color-secondary-light-2); + --color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */ } ::-webkit-calendar-picker-indicator {