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

bugfix: error color and number color #927

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

bugfix: error color and number color #927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd0a77
color bugfix
reatang Mar 9, 2020
7a809e7
ace_numeric color use hex
reatang Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js/ace/theme-jsoneditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ color: #96DC5F
color: darkorange
}
.ace-jsoneditor .ace_constant.ace_numeric {
color: red
color: rgb(0, 0, 205)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since all colors are using HEX code, it maybe good for consistency to also enter the color for numbers as HEX (#ee422e)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I borrowed the ace editor the color of the number.

}
.ace-jsoneditor .ace_constant.ace_character.ace_entity {
color: #BF78CC
Expand Down
2 changes: 1 addition & 1 deletion src/scss/jsoneditor/_contextmenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
background: $jse-preview;
height: 200px;
&.jsoneditor-error {
color: $jse-number;
color: $jse-error;
}
}
.jsoneditor-jmespath-wizard {
Expand Down
4 changes: 2 additions & 2 deletions src/scss/jsoneditor/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $jse-blue: #3883fa !default;
$jse-content-color: #1a1a1a !default;

$jse-string: #006000 !default;
$jse-number: #ee422e !default;
$jse-number: #6897bb !default;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason that you changed the colors for numbers from red to blue? (I would prefer to keep the red color)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

red just like Error 😂

$jse-boolean: #ff8c00 !default;
$jse-null: #004ed0 !default;
$jse-invalid: #000000 !default;
Expand All @@ -15,7 +15,7 @@ $jse-preview: #f5f5f5 !default;
$jse-busy: #ffffab !default;
$jse-busy-border-color: #ffee00 !default;

$jse-error: #ee2e2e70 !default;
$jse-error: #ee2e2e !default;
$jse-separator: #e5e5e5 !default;
$jse-highlight-bg: #ffee00 !default;
$jse-highlight-border-color: #ffc700 !default;
Expand Down