Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add caret styling CSS #15651

Merged
merged 10 commits into from
May 5, 2021
Merged

Add caret styling CSS #15651

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e0bdeea
Add caret styling CSS
silverwind Apr 28, 2021
82df6ea
add rule in arc-green as well
silverwind May 1, 2021
462996d
grammar
silverwind May 1, 2021
a7ee094
Merge branch 'master' into caret-color
zeripath May 1, 2021
12dae0b
Update web_src/less/themes/theme-arc-green.less
zeripath May 1, 2021
4cdd52a
remove extra rule
silverwind May 3, 2021
dc31b17
add comment
silverwind May 3, 2021
4465e03
Merge branch 'main' into caret-color
techknowlogick May 4, 2021
f1f009c
Merge branch 'main' into caret-color
techknowlogick May 5, 2021
4289d0b
Merge branch 'main' into caret-color
techknowlogick May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions web_src/less/_editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
}

.ui.horizontal.segments > .segment {
Expand Down