From 101b235d46c4609de81df279d1c9910618e31f47 Mon Sep 17 00:00:00 2001 From: yanglj Date: Mon, 30 Oct 2023 15:55:18 +0800 Subject: [PATCH 1/2] Fix selection colors in new UI of light theme, it also works with classic UI; 1. add colors const for following official light theme style from expUI_light.theme.json; 2. change several selection-about colors, including selection color in editor, global selection background color and foreground color. It's more compatible with the Intellij Light theme, also closer with VS code light theme; 3. fix issue #159. --- .../resources/themes/vscode_light.theme.json | 104 ++++++++++++++++++ .../resources/themes/vscode_light_modern.xml | 2 + 2 files changed, 106 insertions(+) diff --git a/src/main/resources/themes/vscode_light.theme.json b/src/main/resources/themes/vscode_light.theme.json index 2634aa0..a0a39c7 100644 --- a/src/main/resources/themes/vscode_light.theme.json +++ b/src/main/resources/themes/vscode_light.theme.json @@ -3,9 +3,113 @@ "dark": false, "author": "Dinesh Srinivasan", "editorScheme": "/themes/vscode_light_modern.xml", + + "colors": { + "Grey1": "#000000", + "Grey2": "#27282E", + "Grey3": "#383A42", + "Grey4": "#494B57", + "Grey5": "#5A5D6B", + "Grey6": "#6C707E", + "Grey7": "#818594", + "Grey8": "#A8ADBD", + "Grey9": "#C9CCD6", + "Grey10": "#D3D5DB", + "Grey11": "#DFE1E5", + "Grey12": "#EBECF0", + "Grey13": "#F7F8FA", + "Grey14": "#FFFFFF", + "windowsPopupBorder": "#B9BDC9", + + "Blue1": "#2E55A3", + "Blue2": "#315FBD", + "Blue3": "#3369D6", + "Blue4": "#3574F0", + "Blue5": "#4682FA", + "Blue6": "#588CF3", + "Blue7": "#709CF5", + "Blue8": "#88ADF7", + "Blue9": "#A0BDF8", + "Blue10": "#C2D6FC", + "Blue11": "#D4E2FF", + "Blue12": "#EDF3FF", + "Blue13": "#F5F8FE", + + "Green1": "#1E6B33", + "Green2": "#1F7536", + "Green3": "#1F8039", + "Green4": "#208A3C", + "Green5": "#369650", + "Green6": "#55A76A", + "Green7": "#89C398", + "Green8": "#AFDBB8", + "Green9": "#C5E5CC", + "Green10": "#E6F7E9", + "Green11": "#F2FCF3", + + "Yellow1": "#A46704", + "Yellow2": "#C27D04", + "Yellow3": "#DF9303", + "Yellow4": "#FFAF0F", + "Yellow5": "#FDBD3D", + "Yellow6": "#FED277", + "Yellow7": "#FEE6B1", + "Yellow8": "#FFF1D1", + "Yellow9": "#FFF6DE", + "Yellow10": "#FFFAEB", + + "Red1": "#AD2B38", + "Red2": "#BC303E", + "Red3": "#CC3645", + "Red4": "#DB3B4B", + "Red5": "#E55765", + "Red6": "#E46A76", + "Red7": "#ED99A1", + "Red8": "#F2B6BB", + "Red9": "#FAD4D8", + "Red10": "#FFF2F3", + "Red11": "#FFF7F7", + + "Orange1": "#A14916", + "Orange2": "#B85516", + "Orange3": "#CE6117", + "Orange4": "#E56D17", + "Orange5": "#EC8F4C", + "Orange6": "#F2B181", + "Orange7": "#F9D2B6", + "Orange8": "#FCE6D6", + "Orange9": "#FFF4EB", + + "Teal1": "#096A6E", + "Teal2": "#077A7F", + "Teal3": "#058B90", + "Teal4": "#039BA1", + "Teal5": "#3FB3B8", + "Teal6": "#7BCCCF", + "Teal7": "#B6E4E5", + "Teal8": "#DAF4F5", + "Teal9": "#F2FCFC", + + "Purple1": "#55339C", + "Purple2": "#643CB8", + "Purple3": "#7444D4", + "Purple4": "#834DF0", + "Purple5": "#A177F4", + "Purple6": "#BFA1F8", + "Purple7": "#DCCBFB", + "Purple8": "#EFE5FF", + "Purple9": "#FAF5FF" + }, + "ui": { "*": { + "selectionBackground": "Blue11", + "lightSelectionBackground": "Blue11", + "selectionInactiveBackground": "Grey11", + "selectionForeground": "Grey1", + "selectionInactiveForeground": "Grey1", + "hoverBackground": "Blue12" }, "Editor": { diff --git a/src/main/resources/themes/vscode_light_modern.xml b/src/main/resources/themes/vscode_light_modern.xml index dce0f56..8a10376 100644 --- a/src/main/resources/themes/vscode_light_modern.xml +++ b/src/main/resources/themes/vscode_light_modern.xml @@ -9,6 +9,8 @@