From bdd0a77beb58def9124d821353b2a9df2516ceee Mon Sep 17 00:00:00 2001 From: reatang Date: Mon, 9 Mar 2020 17:02:42 +0800 Subject: [PATCH 1/2] color bugfix --- src/js/ace/theme-jsoneditor.js | 2 +- src/scss/jsoneditor/_contextmenu.scss | 2 +- src/scss/jsoneditor/_variables.scss | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/ace/theme-jsoneditor.js b/src/js/ace/theme-jsoneditor.js index db8e6620a..145c39f25 100644 --- a/src/js/ace/theme-jsoneditor.js +++ b/src/js/ace/theme-jsoneditor.js @@ -102,7 +102,7 @@ color: #96DC5F color: darkorange } .ace-jsoneditor .ace_constant.ace_numeric { -color: red +color: rgb(0, 0, 205) } .ace-jsoneditor .ace_constant.ace_character.ace_entity { color: #BF78CC diff --git a/src/scss/jsoneditor/_contextmenu.scss b/src/scss/jsoneditor/_contextmenu.scss index 9bfbf8f2b..fa57d73a3 100644 --- a/src/scss/jsoneditor/_contextmenu.scss +++ b/src/scss/jsoneditor/_contextmenu.scss @@ -321,7 +321,7 @@ background: $jse-preview; height: 200px; &.jsoneditor-error { - color: $jse-number; + color: $jse-error; } } .jsoneditor-jmespath-wizard { diff --git a/src/scss/jsoneditor/_variables.scss b/src/scss/jsoneditor/_variables.scss index 357ea9a6f..8b25bab37 100644 --- a/src/scss/jsoneditor/_variables.scss +++ b/src/scss/jsoneditor/_variables.scss @@ -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; $jse-boolean: #ff8c00 !default; $jse-null: #004ed0 !default; $jse-invalid: #000000 !default; @@ -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; From 7a809e7bacc0e5df749f17de31d91f3323a7d09f Mon Sep 17 00:00:00 2001 From: reatang Date: Sat, 14 Mar 2020 16:56:31 +0800 Subject: [PATCH 2/2] ace_numeric color use hex --- src/js/ace/theme-jsoneditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/ace/theme-jsoneditor.js b/src/js/ace/theme-jsoneditor.js index 145c39f25..c360704a8 100644 --- a/src/js/ace/theme-jsoneditor.js +++ b/src/js/ace/theme-jsoneditor.js @@ -102,7 +102,7 @@ color: #96DC5F color: darkorange } .ace-jsoneditor .ace_constant.ace_numeric { -color: rgb(0, 0, 205) +color: #6897BB } .ace-jsoneditor .ace_constant.ace_character.ace_entity { color: #BF78CC