From e0bdeead7aff32f63d7ea79e74a5170586a055dc Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 28 Apr 2021 18:24:54 +0200 Subject: [PATCH 1/6] Add caret styling CSS Fixes: https://github.com/go-gitea/gitea/issues/15644 --- 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 bba378dde2476..7e563d2f2332b 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 156430af0e8a3..b785189dbb3fd 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 7c084284d1053..dc283259ebd4c 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-dark); } .ui.horizontal.segments > .segment { From 82df6ea3dd95a30fd1683e8499cc3ad5d4bc3c51 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 1 May 2021 15:02:13 +0200 Subject: [PATCH 2/6] add rule in arc-green as well --- web_src/less/themes/theme-arc-green.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index dc283259ebd4c..7ef5c25e6f1ea 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -111,6 +111,11 @@ --color-caret: var(--color-text-dark); } +/* see https://github.com/go-gitea/gitea/pull/15651 why this is duplicated */ +.CodeMirror-cursor { + border-color: var(--color-caret) !important; +} + .ui.horizontal.segments > .segment { background-color: #383c4a; } From 462996d27ebc37c241f2bbbed2f80544edd348c9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 1 May 2021 15:03:03 +0200 Subject: [PATCH 3/6] grammar --- web_src/less/themes/theme-arc-green.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 7ef5c25e6f1ea..b4ae5aef830aa 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -111,7 +111,7 @@ --color-caret: var(--color-text-dark); } -/* see https://github.com/go-gitea/gitea/pull/15651 why this is duplicated */ +/* see https://github.com/go-gitea/gitea/pull/15651 for why this is duplicated */ .CodeMirror-cursor { border-color: var(--color-caret) !important; } From 12dae0bb34274698fbd1502f027df288b688acf0 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sat, 1 May 2021 21:04:48 +0100 Subject: [PATCH 4/6] Update web_src/less/themes/theme-arc-green.less Co-authored-by: Wim --- web_src/less/themes/theme-arc-green.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index b4ae5aef830aa..4bc71f627c51b 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -108,7 +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-dark); + --color-caret: var(--color-text); } /* see https://github.com/go-gitea/gitea/pull/15651 for why this is duplicated */ From 4cdd52a6d2e1b6823dd7f77787a2d0e7d5bc3b6d Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 3 May 2021 23:46:52 +0200 Subject: [PATCH 5/6] remove extra rule --- web_src/less/themes/theme-arc-green.less | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 4bc71f627c51b..b42a55447f37e 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -111,11 +111,6 @@ --color-caret: var(--color-text); } -/* see https://github.com/go-gitea/gitea/pull/15651 for why this is duplicated */ -.CodeMirror-cursor { - border-color: var(--color-caret) !important; -} - .ui.horizontal.segments > .segment { background-color: #383c4a; } From dc31b177326b1ec3e3496ba9d7f508d59530b808 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 4 May 2021 00:04:37 +0200 Subject: [PATCH 6/6] add comment --- web_src/less/themes/theme-arc-green.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index b42a55447f37e..ca8657cacf626 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -108,7 +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); + --color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */ } .ui.horizontal.segments > .segment {