From 60a269443ac55543fcf6ccf49b89097da211c273 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 14:06:58 +0530 Subject: [PATCH 01/82] Updated gitignore and removed redundant attributes from the icon svgs. --- .gitignore | 3 ++- theme/jetbrains/resources/META-INF/pluginIcon.svg | 14 +++++++------- .../resources/META-INF/pluginIcon_dark.svg | 14 +++++++------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 466563a..4c9d926 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ __pycache__ /.idea /output -.DS_Store \ No newline at end of file +.DS_Store +/venv/ diff --git a/theme/jetbrains/resources/META-INF/pluginIcon.svg b/theme/jetbrains/resources/META-INF/pluginIcon.svg index e564bd1..f5f0b9b 100644 --- a/theme/jetbrains/resources/META-INF/pluginIcon.svg +++ b/theme/jetbrains/resources/META-INF/pluginIcon.svg @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg b/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg index e564bd1..f5f0b9b 100644 --- a/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg +++ b/theme/jetbrains/resources/META-INF/pluginIcon_dark.svg @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + \ No newline at end of file From 355c5b55e6a5107ecd66588c8b11aee1d6e1cd0f Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 14:10:56 +0530 Subject: [PATCH 02/82] Removed deprecated keys from theme.json. --- theme/jetbrains/templates/theme.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index fe315cc..e6ee5aa 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -90,7 +90,6 @@ "nonEditableBackground": "{{theme.colors.base2}}" }, "background": "{{theme.colors.base8x0c}}", - "disabledBackground": "{{theme.colors.base1}}", "disabledForeground": "{{theme.colors.base4}}", "foreground": "{{theme.colors.base8}}", "modifiedItemForeground": "{{theme.colors.yellow}}", @@ -149,7 +148,6 @@ }, "DragAndDrop": { "areaBackground": "{{theme.colors.base2}}", - "areaBorderColor": "{{theme.colors.base2}}", "areaForeground": "{{theme.colors.base8}}" }, "Editor": { @@ -194,8 +192,7 @@ "lineSeparatorColor": "{{theme.colors.base2}}" }, "HelpTooltip": { - "borderColor": "{{theme.colors.base2}}", - "infoForeground": "{{theme.colors.base6}}" + "borderColor": "{{theme.colors.base2}}" }, "InformationHint": { "borderColor": "{{theme.colors.base2}}" @@ -331,8 +328,7 @@ "updateForeground": "{{theme.colors.base8}}" }, "SearchField": { - "background": "{{theme.colors.base8x0c}}", - "borderColor": "{{theme.colors.base8x0c}}" + "background": "{{theme.colors.base8x0c}}" }, "SectionHeader": { "background": "{{theme.colors.base2}}", @@ -456,8 +452,7 @@ "draggingColor": "{{theme.colors.base3}}" }, "StatusBar": { - "borderColor": "{{theme.colors.base8x0c}}", - "hoverBackground": "{{theme.colors.base8x0c}}" + "borderColor": "{{theme.colors.base8x0c}}" }, "TabbedPane": { "background": "{{theme.colors.base2}}", From 95dfd216fc7f37a9c53fde6fcd8618c65f695588 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 14:59:28 +0530 Subject: [PATCH 03/82] Updated and Fixed Checkbox Colors. --- theme/jetbrains/templates/theme.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index e6ee5aa..518bdc8 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -663,17 +663,17 @@ }, "icons": { "ColorPalette": { - "Checkbox.Background.Default.Dark": "#{{theme.colors.base3}}", - "Checkbox.Background.Disabled.Dark": "#{{theme.colors.base1}}", - "Checkbox.Background.Selected.Dark": "#{{theme.colors.base3}}", - "Checkbox.Border.Default.Dark": "#{{theme.colors.base3}}", - "Checkbox.Border.Disabled.Dark": "#{{theme.colors.base1}}", - "Checkbox.Border.Selected.Dark": "#{{theme.colors.base3}}", - "Checkbox.Focus.Thin.Default.Dark": "#{{theme.colors.base3}}", - "Checkbox.Focus.Thin.Selected.Dark": "#{{theme.colors.base1}}", - "Checkbox.Focus.Wide.Dark": "#{{theme.colors.base3}}", - "Checkbox.Foreground.Disabled.Dark": "#{{theme.colors.base6}}", - "Checkbox.Foreground.Selected.Dark": "#{{theme.colors.base8}}" + "Checkbox.Background.Default.Dark": "{{theme.colors.base4}}", + "Checkbox.Background.Disabled.Dark": "{{theme.colors.base1}}", + "Checkbox.Background.Selected.Dark": "{{theme.colors.base4}}", + "Checkbox.Border.Default.Dark": "{{theme.colors.base6}}", + "Checkbox.Border.Disabled.Dark": "{{theme.colors.base2}}", + "Checkbox.Border.Selected.Dark": "{{theme.colors.base6}}", + "Checkbox.Focus.Thin.Default.Dark": "{{theme.colors.base3}}", + "Checkbox.Focus.Thin.Selected.Dark": "{{theme.colors.base1}}", + "Checkbox.Focus.Wide.Dark": "{{theme.colors.orange}}", + "Checkbox.Foreground.Disabled.Dark": "{{theme.colors.base6}}", + "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base9}}" } } } From c0c58089fce144398cd0e0ed2a906cedff5eea28 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 15:18:23 +0530 Subject: [PATCH 04/82] Updated action button colors. --- theme/jetbrains/templates/theme.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 518bdc8..c8aaacd 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -25,10 +25,10 @@ "separatorColor": "{{theme.colors.base2}}" }, "ActionButton": { - "hoverBackground": "{{theme.colors.base8x0c}}", - "hoverBorderColor": "{{theme.colors.base8x0c}}", - "pressedBackground": "{{theme.colors.base8x0c}}", - "pressedBorderColor": "{{theme.colors.base8x0c}}" + "hoverBackground": "{{theme.colors.base4}}", + "hoverBorderColor": "{{theme.colors.base6}}", + "pressedBackground": "{{theme.colors.base5}}", + "pressedBorderColor": "{{theme.colors.blue}}" }, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", From 4a6ba8d9fa27354f8fe060cad51ab7fb4efec6db Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 15:22:55 +0530 Subject: [PATCH 05/82] Updated border colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index c8aaacd..a8b1aaa 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -32,7 +32,7 @@ }, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", - "color": "{{theme.colors.base8x0c}}" + "color": "{{theme.colors.base4}}" }, "Button": { "arc": 0, From 5f67888169d6c80906e19ac9733026c857ea08e4 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 15:38:13 +0530 Subject: [PATCH 06/82] Minor changes to the Action Button Border Colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index a8b1aaa..d89349d 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -25,9 +25,9 @@ "separatorColor": "{{theme.colors.base2}}" }, "ActionButton": { - "hoverBackground": "{{theme.colors.base4}}", + "hoverBackground": "{{theme.colors.base3}}", "hoverBorderColor": "{{theme.colors.base6}}", - "pressedBackground": "{{theme.colors.base5}}", + "pressedBackground": "{{theme.colors.base4}}", "pressedBorderColor": "{{theme.colors.blue}}" }, "Borders": { From 74e7b4fb14be16407344af8c95baea3744a3636b Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 15:52:37 +0530 Subject: [PATCH 07/82] Added two new temporary colors. Updated Button Designs. --- colors/spectrum.yaml | 2 ++ theme/jetbrains/templates/theme.json | 36 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index e4f2caa..3a33527 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -13,10 +13,12 @@ colors: base1: "#191919" base2: "#222222" base3: "#363537" + base3.5: "#292929" base4: "#525053" base5: "#69676c" base6: "#8b888f" base7: "#bab6c0" base8: "#f7f1ff" + base9: "#cdcdcd" # variants base8x0c: "#2b2b2b" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index d89349d..85b08ba 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -35,28 +35,28 @@ "color": "{{theme.colors.base4}}" }, "Button": { - "arc": 0, - "background": "{{theme.colors.base3}}", + "arc": 6, + "background": "{{theme.colors.base3.5}}", "default": { - "endBackground": "{{theme.colors.base3}}", - "endBorderColor": "{{theme.colors.base3}}", - "foreground": "{{theme.colors.yellow}}", - "focusColor": "{{theme.colors.yellow}}", - "focusedBorderColor": "{{theme.colors.base3}}", - "shadowColor": "{{theme.colors.base3}}", - "startBackground": "{{theme.colors.base3}}", - "startBorderColor": "{{theme.colors.base3}}" + "endBackground": "{{theme.colors.base3.5}}", + "endBorderColor": "{{theme.colors.base3.5}}", + "foreground": "{{theme.colors.blue}}", + "focusColor": "{{theme.colors.orange}}", + "focusedBorderColor": "{{theme.colors.base3.5}}", + "shadowColor": "{{theme.colors.base3.5}}", + "startBackground": "{{theme.colors.base3.5}}", + "startBorderColor": "{{theme.colors.base3.5}}" }, - "disabledBorderColor": "{{theme.colors.base3}}", - "disabledText": "{{theme.colors.base4}}", - "endBackground": "{{theme.colors.base3}}", - "endBorderColor": "{{theme.colors.base3}}", - "focusedBorderColor": "{{theme.colors.base3}}", + "disabledBorderColor": "{{theme.colors.base3.5}}", + "disabledText": "{{theme.colors.base6}}", + "endBackground": "{{theme.colors.base3.5}}", + "endBorderColor": "{{theme.colors.base3.5}}", + "focusedBorderColor": "{{theme.colors.base3.5}}", "foreground": "{{theme.colors.base8}}", - "shadowColor": "{{theme.colors.base3}}", + "shadowColor": "{{theme.colors.base3.5}}", "shadowWidth": 0, - "startBackground": "{{theme.colors.base3}}", - "startBorderColor": "{{theme.colors.base3}}" + "startBackground": "{{theme.colors.base3.5}}", + "startBorderColor": "{{theme.colors.base3.5}}" }, "CheckBox": { "background": "{{theme.colors.base2}}", From 645cd5ee2b5c3d61b3ba0871713302062d1e05ba Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 16:04:59 +0530 Subject: [PATCH 08/82] Added new color and applied minor color change. --- colors/spectrum.yaml | 1 + theme/jetbrains/templates/theme.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index 3a33527..af066c7 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -7,6 +7,7 @@ colors: yellow: "#fce566" green: "#7bd88f" blue: "#5ad4e6" + darkBlue: "#0050bb" purple: "#948ae3" # base colors base0: "#131313" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 85b08ba..45b26f2 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -27,12 +27,12 @@ "ActionButton": { "hoverBackground": "{{theme.colors.base3}}", "hoverBorderColor": "{{theme.colors.base6}}", - "pressedBackground": "{{theme.colors.base4}}", + "pressedBackground": "{{theme.colors.darkBlue}}", "pressedBorderColor": "{{theme.colors.blue}}" }, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", - "color": "{{theme.colors.base4}}" + "color": "{{theme.colors.base3.5}}" }, "Button": { "arc": 6, From 633872007b8df6238c1e6e7ee3f6520c30b3bae3 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 16:22:40 +0530 Subject: [PATCH 09/82] Minor Color Improvements. --- theme/jetbrains/templates/theme.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 45b26f2..1dfd16b 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -40,7 +40,7 @@ "default": { "endBackground": "{{theme.colors.base3.5}}", "endBorderColor": "{{theme.colors.base3.5}}", - "foreground": "{{theme.colors.blue}}", + "foreground": "{{theme.colors.green}}", "focusColor": "{{theme.colors.orange}}", "focusedBorderColor": "{{theme.colors.base3.5}}", "shadowColor": "{{theme.colors.base3.5}}", @@ -51,8 +51,8 @@ "disabledText": "{{theme.colors.base6}}", "endBackground": "{{theme.colors.base3.5}}", "endBorderColor": "{{theme.colors.base3.5}}", - "focusedBorderColor": "{{theme.colors.base3.5}}", - "foreground": "{{theme.colors.base8}}", + "focusedBorderColor": "{{theme.colors.base3.5}", + "foreground": "{{theme.colors.base9}}", "shadowColor": "{{theme.colors.base3.5}}", "shadowWidth": 0, "startBackground": "{{theme.colors.base3.5}}", From 447a0a9e2f576b309ab046f1bafb0d14765877ac Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 16:31:17 +0530 Subject: [PATCH 10/82] Updated CheckBox color and added Banner placeholder. --- theme/jetbrains/templates/theme.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 1dfd16b..f7343aa 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -30,6 +30,7 @@ "pressedBackground": "{{theme.colors.darkBlue}}", "pressedBorderColor": "{{theme.colors.blue}}" }, + "Banner": {}, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", "color": "{{theme.colors.base3.5}}" @@ -60,9 +61,9 @@ }, "CheckBox": { "background": "{{theme.colors.base2}}", - "disabledText": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "select": "{{theme.colors.yellow}}" + "disabledText": "{{theme.colors.base3.5}}", + "foreground": "{{theme.colors.base9}}", + "select": "{{theme.colors.orange}}" }, "CheckBoxMenuItem": { "acceleratorForeground": "{{theme.colors.base6}}", From 9f24ad571837adb62c5e11bb7fa6a5327cc92fde Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 18:08:46 +0530 Subject: [PATCH 11/82] Updated ComboBox and ComboPopup. --- theme/jetbrains/templates/theme.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index f7343aa..3eb7ae3 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -85,21 +85,21 @@ }, "ComboBox": { "ArrowButton": { - "background": "{{theme.colors.base3}}", - "disabledIconColor": "{{theme.colors.base4}}", - "iconColor": "{{theme.colors.base8}}", - "nonEditableBackground": "{{theme.colors.base2}}" + "background": "{{theme.colors.base2}}", + "nonEditableBackground": "{{theme.colors.base2}}", + "iconColor": "{{theme.colors.blue}}", + "disabledIconColor": "{{theme.colors.base3.5}}" }, "background": "{{theme.colors.base8x0c}}", "disabledForeground": "{{theme.colors.base4}}", "foreground": "{{theme.colors.base8}}", - "modifiedItemForeground": "{{theme.colors.yellow}}", + "modifiedItemForeground": "{{theme.colors.orange}}", "nonEditableBackground": "{{theme.colors.base8x0c}}", - "selectionBackground": "{{theme.colors.base2}}", - "selectionForeground": "{{theme.colors.yellow}}" + "selectionBackground": "{{theme.colors.blue}}", + "selectionForeground": "{{theme.colors.base1}}" }, "ComboPopup": { - "border": "{{theme.colors.base2}}" + "border": "0,0,0,0,000000" }, "CompletionPopup": { "foreground": "{{theme.colors.base8}}", From 946c0b41c602e9f628a3f7ee5af285da604eeca8 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 18:09:19 +0530 Subject: [PATCH 12/82] Updated Completion Popup. --- theme/jetbrains/templates/theme.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 3eb7ae3..b57188a 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -102,10 +102,21 @@ "border": "0,0,0,0,000000" }, "CompletionPopup": { - "foreground": "{{theme.colors.base8}}", + "Body": { + "insets": "" + }, + "Advertiser": { + "background": "{{theme.colors.base2}}", + "borderInsets": "", + "fontSizeOffset": "", + "foreground": "{{theme.colors.base7}}" + }, + "foreground": "{{theme.colors.blue}}", "matchForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base4}}", - "selectionBackground": "{{theme.colors.base4}}" + "selectionInactiveBackground": "{{theme.colors.base3}}", + "selectionBackground": "{{theme.colors.base3}}", + "nonFocusedMask": "", + "selectionInnerInsets": "" }, "Component": { "arc": 4, From 8997d69ea6033f9ad4ffd7b815d6783a9b4fbefb Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 18:11:03 +0530 Subject: [PATCH 13/82] ComboBox ArrowButton Color Fix. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index b57188a..a5de524 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -87,7 +87,7 @@ "ArrowButton": { "background": "{{theme.colors.base2}}", "nonEditableBackground": "{{theme.colors.base2}}", - "iconColor": "{{theme.colors.blue}}", + "iconColor": "{{theme.colors.base8}}", "disabledIconColor": "{{theme.colors.base3.5}}" }, "background": "{{theme.colors.base8x0c}}", From 5fe5b45260a153daebe6fa6c82aacace50d57d60 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 18:36:36 +0530 Subject: [PATCH 14/82] Updated Component Design. --- theme/jetbrains/templates/theme.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index a5de524..8fff63f 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -119,14 +119,19 @@ "selectionInnerInsets": "" }, "Component": { - "arc": 4, - "borderColor": "{{theme.colors.base8x0c}}", + "arc": 10, + "borderColor": "{{theme.colors.base5}}", "disabledBorderColor": "{{theme.colors.base8x0c}}", - "focusColor": "{{theme.colors.yellow}}", - "focusedBorderColor": "{{theme.colors.yellow}}", + "errorFocusColor": "{{theme.colors.errorRed}}", + "focusColor": "{{theme.colors.orange}}", + "focusedBorderColor": "{{theme.colors.orange}}", + "focusWidth": "", "hoverIconColor": "{{theme.colors.yellow}}", - "infoForeground": "{{theme.colors.base6}}", - "iconColor": "{{theme.colors.base8}}" + "iconColor": "{{theme.colors.base8}}", + "inactiveErrorFocusColor": "", + "inactiveWarningFocusColor": "", + "infoForeground": "{{theme.colors.base5}}", + "warningFocusColor": "" }, "Counter": { "background": "{{theme.colors.yellow}}", From 84ed40e412f41a252ca5187bdc70113d33cea8c4 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 19:12:19 +0530 Subject: [PATCH 15/82] Updated Debugger design. --- theme/jetbrains/templates/theme.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 8fff63f..9707960 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -138,14 +138,18 @@ "foreground": "{{theme.colors.base0}}" }, "Debugger": { + "EvaluateExpression": { + "background": "" + }, "Variables": { + "changedValueForeground": "{{theme.colors.base5}}", "collectingDataForeground": "{{theme.colors.base6}}", - "changedValueForeground": "{{theme.colors.yellow}}", - "errorMessageForeground": "{{theme.colors.red}}", + "errorMessageForeground": "{{theme.colors.errorRed}}", "evaluatingExpressionForeground": "{{theme.colors.base6}}", - "exceptionForeground": "{{theme.colors.blue}}", + "exceptionForeground": "{{theme.colors.errorRed}}", "modifyingValueForeground": "{{theme.colors.yellow}}", - "valueForeground": "{{theme.colors.yellow}}" + "typeForeground": "{{theme.colors.base5}}", + "valueForeground": "{{theme.colors.base5}}" } }, "DebuggerTabs": { From e1b1d658233911acec877b39feeb6932c023a065 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 19:21:02 +0530 Subject: [PATCH 16/82] Updated Drag and Drop Design. --- theme/jetbrains/templates/theme.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 9707960..b463732 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -169,7 +169,9 @@ }, "DragAndDrop": { "areaBackground": "{{theme.colors.base2}}", - "areaForeground": "{{theme.colors.base8}}" + "areaForeground": "{{theme.colors.base8}}", + "rowBackground": "{{theme.colors.base4}}", + "borderColor": "" }, "Editor": { "background": "{{theme.colors.base1}}", From 7e9b9f1bc074116b1e0d8ad6a79278ce1ca42c31 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 18 Dec 2022 19:28:07 +0530 Subject: [PATCH 17/82] Updated Editor Colors. --- theme/jetbrains/templates/theme.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index b463732..38f3ea6 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -176,7 +176,14 @@ "Editor": { "background": "{{theme.colors.base1}}", "foreground": "{{theme.colors.base8}}", - "shortcutForeground": "{{theme.colors.base6}}" + "shortcutForeground": "{{theme.colors.base6}}", + "SearchField": { + "background": "{{theme.colors.base2}}", + "borderInsets": "" + }, + "Toolbar": { + "borderColor": "{{theme.colors.base4}}" + } }, "EditorPane": { "background": "{{theme.colors.base1}}", From 94366fec58f1c6ce5a754e9582fb00e653e8d0f6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 04:59:24 +0530 Subject: [PATCH 18/82] Minor Updates to the button and component border colors. --- theme/jetbrains/templates/theme.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 38f3ea6..0e10f72 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -41,8 +41,8 @@ "default": { "endBackground": "{{theme.colors.base3.5}}", "endBorderColor": "{{theme.colors.base3.5}}", - "foreground": "{{theme.colors.green}}", - "focusColor": "{{theme.colors.orange}}", + "foreground": "{{theme.colors.yellow}}", + "focusColor": "{{theme.colors.blue}}", "focusedBorderColor": "{{theme.colors.base3.5}}", "shadowColor": "{{theme.colors.base3.5}}", "startBackground": "{{theme.colors.base3.5}}", @@ -123,14 +123,14 @@ "borderColor": "{{theme.colors.base5}}", "disabledBorderColor": "{{theme.colors.base8x0c}}", "errorFocusColor": "{{theme.colors.errorRed}}", - "focusColor": "{{theme.colors.orange}}", - "focusedBorderColor": "{{theme.colors.orange}}", + "focusColor": "{{theme.colors.yellow}}", + "focusedBorderColor": "{{theme.colors.yellow}}", "focusWidth": "", "hoverIconColor": "{{theme.colors.yellow}}", "iconColor": "{{theme.colors.base8}}", "inactiveErrorFocusColor": "", "inactiveWarningFocusColor": "", - "infoForeground": "{{theme.colors.base5}}", + "infoForeground": "{{theme.colors.base6}}", "warningFocusColor": "" }, "Counter": { From cede0b3885af802ea44834cc8ecb86f93f048baa Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 05:00:23 +0530 Subject: [PATCH 19/82] Updated the FileColors. These are the colors assigned to the tabs in editor for files are not associated with the current project. --- theme/jetbrains/templates/theme.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 0e10f72..35190dd 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -202,7 +202,13 @@ "underlinedTabForeground": "{{theme.colors.base7}}" }, "FileColor": { - "Yellow": "00000000" + "Blue": "#227d6c", + "Gray": "#665751", + "Green": "#356f0f", + "Orange": "#a04913", + "Rose": "#a01384", + "Violet": "#1328a0", + "Yellow": "#584d10" }, "FormattedTextField": { "background": "{{theme.colors.base8x0c}}", From c74f0b08218ce43229dc9eb4e5e5ba6fdcd348ee Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 05:22:55 +0530 Subject: [PATCH 20/82] Updated EditorPane Colors. Appear on Editor PopUps and for Non-Editable Code Background. --- theme/jetbrains/templates/theme.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 35190dd..eb8fb6b 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -188,11 +188,12 @@ "EditorPane": { "background": "{{theme.colors.base1}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveBackground": "{{theme.colors.base2}}", - "inactiveForeground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.blue}}", + "inactiveBackground": "{{theme.colors.base4}}", + "inactiveForeground": "{{theme.colors.base2}}", "selectionBackground": "{{theme.colors.base3}}", - "selectionForeground": "{{theme.colors.yellow}}" + "selectionForeground": "{{theme.colors.yellow}}", + "splitBorder": "{{theme.colors.base5}}" }, "EditorTabs": { "borderColor": "{{theme.colors.base8x0c}}", From 9e0672859706b105372713e6ce5d496faa0a88a6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 05:32:32 +0530 Subject: [PATCH 21/82] ComboBox minor color update. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index eb8fb6b..0cb3964 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -93,7 +93,7 @@ "background": "{{theme.colors.base8x0c}}", "disabledForeground": "{{theme.colors.base4}}", "foreground": "{{theme.colors.base8}}", - "modifiedItemForeground": "{{theme.colors.orange}}", + "modifiedItemForeground": "{{theme.colors.blue}}", "nonEditableBackground": "{{theme.colors.base8x0c}}", "selectionBackground": "{{theme.colors.blue}}", "selectionForeground": "{{theme.colors.base1}}" From f9ceb723f86ccef454cf6850dc29ac0d9b0e4e43 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 05:50:22 +0530 Subject: [PATCH 22/82] Updated Component Design. --- colors/spectrum.yaml | 1 + theme/jetbrains/templates/theme.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index af066c7..0207b5d 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -5,6 +5,7 @@ colors: red: "#fc618d" orange: "#fd9353" yellow: "#fce566" + darkYellow: "#d7a916" green: "#7bd88f" blue: "#5ad4e6" darkBlue: "#0050bb" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 0cb3964..8540686 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -121,17 +121,17 @@ "Component": { "arc": 10, "borderColor": "{{theme.colors.base5}}", + "infoForeground": "{{theme.colors.base6}}", "disabledBorderColor": "{{theme.colors.base8x0c}}", - "errorFocusColor": "{{theme.colors.errorRed}}", - "focusColor": "{{theme.colors.yellow}}", - "focusedBorderColor": "{{theme.colors.yellow}}", - "focusWidth": "", + "focusColor": "{{theme.colors.blue}}", + "focusedBorderColor": "{{theme.colors.darkBlue}}", + "focusWidth": 1, "hoverIconColor": "{{theme.colors.yellow}}", "iconColor": "{{theme.colors.base8}}", - "inactiveErrorFocusColor": "", - "inactiveWarningFocusColor": "", - "infoForeground": "{{theme.colors.base6}}", - "warningFocusColor": "" + "errorFocusColor": "{{theme.colors.red}}", + "inactiveErrorFocusColor": "{{theme.colors.errorRed}}", + "warningFocusColor": "{{theme.colors.yellow}}", + "inactiveWarningFocusColor": "{{theme.colors.darkYellow}}" }, "Counter": { "background": "{{theme.colors.yellow}}", From 0e1630a3fab3ce0ea13ddbcd9da843502bbcb78a Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 07:12:05 +0530 Subject: [PATCH 23/82] Color Fixes. Fixed Button Color. Fixed Component Color. Updated Editor & EditorTabs colors. --- colors/spectrum.yaml | 9 +++++---- theme/jetbrains/templates/theme.json | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index 0207b5d..02d1f39 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -3,6 +3,7 @@ name: Monokai Pro (Filter Spectrum) colors: # primary colors red: "#fc618d" + errorRed: "#b92d2d" orange: "#fd9353" yellow: "#fce566" darkYellow: "#d7a916" @@ -14,13 +15,13 @@ colors: base0: "#131313" base1: "#191919" base2: "#222222" - base3: "#363537" - base3.5: "#292929" + base3: "#292929" + base3.5: "#363537" base4: "#525053" base5: "#69676c" base6: "#8b888f" base7: "#bab6c0" - base8: "#f7f1ff" - base9: "#cdcdcd" + base8: "#cdcdcd" + base9: "#f7f1ff" # variants base8x0c: "#2b2b2b" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 8540686..8701087 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -52,7 +52,7 @@ "disabledText": "{{theme.colors.base6}}", "endBackground": "{{theme.colors.base3.5}}", "endBorderColor": "{{theme.colors.base3.5}}", - "focusedBorderColor": "{{theme.colors.base3.5}", + "focusedBorderColor": "{{theme.colors.darkBlue}}", "foreground": "{{theme.colors.base9}}", "shadowColor": "{{theme.colors.base3.5}}", "shadowWidth": 0, @@ -120,8 +120,8 @@ }, "Component": { "arc": 10, - "borderColor": "{{theme.colors.base5}}", - "infoForeground": "{{theme.colors.base6}}", + "borderColor": "{{theme.colors.base4}}", + "infoForeground": "{{theme.colors.base5}}", "disabledBorderColor": "{{theme.colors.base8x0c}}", "focusColor": "{{theme.colors.blue}}", "focusedBorderColor": "{{theme.colors.darkBlue}}", @@ -175,14 +175,14 @@ }, "Editor": { "background": "{{theme.colors.base1}}", - "foreground": "{{theme.colors.base8}}", - "shortcutForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base7}}", + "shortcutForeground": "{{theme.colors.base5}}", "SearchField": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base1}}", "borderInsets": "" }, "Toolbar": { - "borderColor": "{{theme.colors.base4}}" + "borderColor": "{{theme.colors.base3.5}}" } }, "EditorPane": { @@ -196,11 +196,16 @@ "splitBorder": "{{theme.colors.base5}}" }, "EditorTabs": { - "borderColor": "{{theme.colors.base8x0c}}", + "borderColor": "{{theme.colors.base3.5}}", "inactiveUnderlineColor": "{{theme.colors.yellow}}", + "underlineHeight": 1, "underlineColor": "{{theme.colors.yellow}}", "underlinedTabBackground": "{{theme.colors.base8x0c}}", - "underlinedTabForeground": "{{theme.colors.base7}}" + "underlinedTabForeground": "{{theme.colors.base7}}", + "tabInsets": "", + "background": "{{theme.colors.base2}}", + "hoverBackground": "{{theme.colors.base0}}", + "inactiveColoredFileBackground": "" }, "FileColor": { "Blue": "#227d6c", From d18b5ac23f6f58236dae507817725717a2736d29 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 07:31:31 +0530 Subject: [PATCH 24/82] Revamped FileColors. --- theme/jetbrains/templates/theme.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 8701087..0ae858b 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -208,13 +208,13 @@ "inactiveColoredFileBackground": "" }, "FileColor": { - "Blue": "#227d6c", - "Gray": "#665751", - "Green": "#356f0f", - "Orange": "#a04913", - "Rose": "#a01384", - "Violet": "#1328a0", - "Yellow": "#584d10" + "Blue": "#00403e", + "Gray": "#393535", + "Green": "#132b00", + "Orange": "#532200", + "Rose": "#4c001d", + "Violet": "#210045", + "Yellow": "#363100" }, "FormattedTextField": { "background": "{{theme.colors.base8x0c}}", From 99347723f434b549e2350139e82c2fc72f607a35 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 07:45:25 +0530 Subject: [PATCH 25/82] Updated Group Separator colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 0ae858b..6d2a879 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -226,8 +226,8 @@ "selectionBackground": "{{theme.colors.base3}}" }, "Group": { - "disabledSeparatorColor": "{{theme.colors.base2}}", - "separatorColor": "{{theme.colors.base2}}" + "disabledSeparatorColor": "{{theme.colors.base3}}", + "separatorColor": "{{theme.colors.base3.5}}" }, "GutterTooltip": { "infoForeground": "{{theme.colors.base8}}", From 54038613315e6ff5768f9c3e7dc5065c8c521144 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 08:18:37 +0530 Subject: [PATCH 26/82] Completion Popup color updates. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 6d2a879..cf9bf9b 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -111,7 +111,7 @@ "fontSizeOffset": "", "foreground": "{{theme.colors.base7}}" }, - "foreground": "{{theme.colors.blue}}", + "foreground": "{{theme.colors.red}}", "matchForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base3}}", "selectionBackground": "{{theme.colors.base3}}", From f8935f9a5d3baa6d15ae63228478884da5e1af44 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 08:41:24 +0530 Subject: [PATCH 27/82] Updated errorRed Color. --- colors/spectrum.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index 02d1f39..3230091 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -3,7 +3,7 @@ name: Monokai Pro (Filter Spectrum) colors: # primary colors red: "#fc618d" - errorRed: "#b92d2d" + errorRed: "#990909" orange: "#fd9353" yellow: "#fce566" darkYellow: "#d7a916" From 4e82a2ef3f8ee1584b5b5828f86c709b2039a7e6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 08:42:27 +0530 Subject: [PATCH 28/82] Updated memory indicator colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index cf9bf9b..723e004 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -266,8 +266,8 @@ "selectionInactiveForeground": "{{theme.colors.yellow}}" }, "MemoryIndicator": { - "allocatedBackground": "{{theme.colors.base3}}", - "usedBackground": "{{theme.colors.base4}}" + "allocatedBackground": "{{theme.colors.base0}}", + "usedBackground": "{{theme.colors.errorRed}}" }, "Menu": { "acceleratorForeground": "{{theme.colors.base6}}", From 1051f310cb461939ef7fafe201a3a54121f1033d Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 08:54:52 +0530 Subject: [PATCH 29/82] Revamped FileColors. --- theme/jetbrains/templates/theme.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 723e004..43b1c07 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -208,13 +208,13 @@ "inactiveColoredFileBackground": "" }, "FileColor": { - "Blue": "#00403e", - "Gray": "#393535", - "Green": "#132b00", - "Orange": "#532200", - "Rose": "#4c001d", - "Violet": "#210045", - "Yellow": "#363100" + "Blue": "#273e3e", + "Gray": "#363636", + "Green": "#27321f", + "Orange": "#44342a", + "Rose": "#4c2936", + "Violet": "#2f223b", + "Yellow": "#39331e" }, "FormattedTextField": { "background": "{{theme.colors.base8x0c}}", From c7196a7708362b13eda475c9f55f351f54442956 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 08:59:34 +0530 Subject: [PATCH 30/82] Updated EditorPane Colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 43b1c07..46952cb 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -189,9 +189,9 @@ "background": "{{theme.colors.base1}}", "caretForeground": "{{theme.colors.yellow}}", "foreground": "{{theme.colors.blue}}", - "inactiveBackground": "{{theme.colors.base4}}", + "inactiveBackground": "{{theme.colors.base3}}", "inactiveForeground": "{{theme.colors.base2}}", - "selectionBackground": "{{theme.colors.base3}}", + "selectionBackground": "{{theme.colors.base1}}", "selectionForeground": "{{theme.colors.yellow}}", "splitBorder": "{{theme.colors.base5}}" }, From 638a1b964dc34a2aa4b036028101a58f1249ce59 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 09:01:19 +0530 Subject: [PATCH 31/82] Updated List colors. --- theme/jetbrains/templates/theme.json | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 46952cb..958b621 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -258,12 +258,28 @@ "visitedForeground": "{{theme.colors.yellow}}" }, "List": { - "background": "{{theme.colors.base1}}", - "foreground": "{{theme.colors.base8}}", + "Button": { + "hoverBackground": "", + "leftRightInset": "", + "separatorColor": "", + "separatorInset": "" + }, + "Tag": { + "background": "", + "foreground": "" + }, + "Line": { + "hoverBackground": "" + }, + "background": "{{theme.colors.base2}}", + "foreground": "{{theme.colors.blue}}", "selectionBackground": "{{theme.colors.base8x0c}}", - "selectionForeground": "{{theme.colors.yellow}}", + "selectionForeground": "{{theme.colors.orange}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", - "selectionInactiveForeground": "{{theme.colors.yellow}}" + "selectionInactiveForeground": "{{theme.colors.yellow}}", + "dropLineColor": "", + "hoverBackground": "", + "hoverInactiveBackground": "" }, "MemoryIndicator": { "allocatedBackground": "{{theme.colors.base0}}", From 9cf43145b5aa5fbed309d48b8d8393e62287f0fc Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 09:38:35 +0530 Subject: [PATCH 32/82] Updated Menu, MenuBar & MenuItems design. --- theme/jetbrains/templates/theme.json | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 958b621..48bf228 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -286,18 +286,25 @@ "usedBackground": "{{theme.colors.errorRed}}" }, "Menu": { + "foreground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base2}}", + "separatorColor": "{{theme.colors.base3.5}}", + "borderInsets": "", + "borderColor": "{{theme.colors.base3.5}}", + "selectionBackground": "{{theme.colors.base3.5}}", + "selectionForeground": "{{theme.colors.yellow}}", "acceleratorForeground": "{{theme.colors.base6}}", "acceleratorSelectionForeground": "{{theme.colors.base8}}", - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base8x0c}}", - "disabledBackground": "{{theme.colors.base3}}", + "disabledBackground": "{{theme.colors.base2}}", "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "separatorColor": "{{theme.colors.base2}}", - "selectionForeground": "{{theme.colors.yellow}}" + "Selection": { + "arc": 7, + "innerInsets": "", + "outerInsets": "" + } }, "MenuBar": { - "borderColor": "{{theme.colors.base8x0c}}", + "borderColor": "{{theme.colors.base3.5}}", "disabledBackground": "{{theme.colors.base2}}", "disabledForeground": "{{theme.colors.base4}}", "foreground": "{{theme.colors.base8}}", @@ -312,7 +319,7 @@ "disabledBackground": "{{theme.colors.base2}}", "disabledForeground": "{{theme.colors.base4}}", "foreground": "{{theme.colors.base8}}", - "selectionBackground": "{{theme.colors.base3}}", + "selectionBackground": "{{theme.colors.base3.5}}", "selectionForeground": "{{theme.colors.yellow}}" }, "NavBar": { From 6ce7eca372e115739b8cc4adade8bb7f3ee660a7 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 09:41:39 +0530 Subject: [PATCH 33/82] Updated List color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 48bf228..d809457 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -272,7 +272,7 @@ "hoverBackground": "" }, "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.blue}}", + "foreground": "{{theme.colors.base8}}", "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.orange}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", From 859282e64519ccc1f15b37fae90e84882cb4c49b Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 10:12:54 +0530 Subject: [PATCH 34/82] Updated Notification Design. --- theme/jetbrains/templates/theme.json | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index d809457..be4fb79 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -326,11 +326,20 @@ "borderColor": "{{theme.colors.base8x0c}}" }, "Notification": { + "arc": 10, "background": "{{theme.colors.base8x0c}}", - "borderColor": "{{theme.colors.base1}}", - "errorBackground": "{{theme.colors.base1}}", - "errorBorderColor": "{{theme.colors.base1}}", "foreground": "{{theme.colors.base8}}", + "borderColor": "{{theme.colors.base4}}", + "borderInsets": "", + "contentActionsInset": "", + "errorBackground": "{{theme.colors.red}}", + "errorBorderColor": "{{theme.colors.errorRed}}", + "errorForeground": "{{theme.colors.base0}}", + "Button": { + "background": "", + "borderColor": "", + "foreground": "" + }, "MoreButton": { "background": "{{theme.colors.base3}}", "foreground": "{{theme.colors.base8}}", @@ -339,11 +348,18 @@ "ToolWindow": { "errorBackground": "{{theme.colors.base8x0c}}", "errorBorderColor": "{{theme.colors.base8x0c}}", + "errorForeground": "{{theme.colors.base0}}", "informativeBackground": "{{theme.colors.base8x0c}}", "informativeBorderColor": "{{theme.colors.base8x0c}}", + "informativeForeground": "{{theme.colors.base8}}", "warningBackground": "{{theme.colors.base8x0c}}", - "warningBorderColor": "{{theme.colors.base8x0c}}" - } + "warningBorderColor": "{{theme.colors.base8x0c}}", + "warningForeground": "{{theme.colors.base8}}" + }, + "titleActionsInset": "", + "titleContentInset": "", + "iconOffsetSize": "", + "linkForeground": "{{theme.colors.yellow}}" }, "OptionPane": { "background": "{{theme.colors.base2}}", From 7c3739a792f276ccb62549eb3b8b91c5ac2912ae Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 10:13:50 +0530 Subject: [PATCH 35/82] Minor Checkbox Update. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index be4fb79..846967a 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -62,7 +62,7 @@ "CheckBox": { "background": "{{theme.colors.base2}}", "disabledText": "{{theme.colors.base3.5}}", - "foreground": "{{theme.colors.base9}}", + "foreground": "{{theme.colors.base8}}", "select": "{{theme.colors.orange}}" }, "CheckBoxMenuItem": { From bd71e979ef02162b54886e99c61dcdedb74def5f Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 10:20:26 +0530 Subject: [PATCH 36/82] Updated Panel Design. --- theme/jetbrains/templates/theme.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 846967a..0ec4338 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -368,7 +368,8 @@ }, "Panel": { "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base6}}" + "foreground": "{{theme.colors.base6}}", + "mouseShortcutBackground": "" }, "ParameterInfo": { "background": "{{theme.colors.base3}}", From 4fa121f1284173cf2aa3eff26c134807f2078a2d Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 10:25:55 +0530 Subject: [PATCH 37/82] List color updates. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 0ec4338..a474755 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -274,9 +274,9 @@ "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.base8}}", "selectionBackground": "{{theme.colors.base8x0c}}", - "selectionForeground": "{{theme.colors.orange}}", + "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", - "selectionInactiveForeground": "{{theme.colors.yellow}}", + "selectionInactiveForeground": "{{theme.colors.orange}}", "dropLineColor": "", "hoverBackground": "", "hoverInactiveBackground": "" From 27d2afc792cb7261f5d4cabce5fcf2d867341f22 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 10:57:31 +0530 Subject: [PATCH 38/82] Updated ProgressBar colors. --- theme/jetbrains/templates/theme.json | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index a474755..82892a3 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -456,11 +456,18 @@ "ProgressBar": { "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.yellow}}", + "failedColor": "{{theme.color.red}}", + "failedEndColor": "{{theme.color.errorRed}}", "indeterminateEndColor": "{{theme.colors.yellow}}", - "indeterminateStartColor": "{{theme.colors.yellow}}", - "progressColor": "{{theme.colors.yellow}}", + "indeterminateStartColor": "{{theme.colors.base5}}", + "passedColor": "{{theme.colors.green}}", + "passedEndColor": "{{theme.colors.base5}}", + "progressColor": "{{theme.colors.green}}", "selectionBackground": "{{theme.colors.base4}}", - "trackColor": "{{theme.colors.base4}}" + "selectionForeground": "{{theme.colors.base2}}", + "trackColor": "{{theme.colors.blue}}", + "warningColor": "{{theme.colors.darkYellow}}", + "warningEndColor": "{{theme.colors.base3}}" }, "RadioButton": { "background": "{{theme.colors.base2}}", From a61031ab46f8bc9627efceac128513c1d86e3084 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 11:16:08 +0530 Subject: [PATCH 39/82] Updated ProgressBar colors. --- theme/jetbrains/templates/theme.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 82892a3..9ce7b3a 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -456,18 +456,18 @@ "ProgressBar": { "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.yellow}}", - "failedColor": "{{theme.color.red}}", - "failedEndColor": "{{theme.color.errorRed}}", "indeterminateEndColor": "{{theme.colors.yellow}}", "indeterminateStartColor": "{{theme.colors.base5}}", - "passedColor": "{{theme.colors.green}}", - "passedEndColor": "{{theme.colors.base5}}", - "progressColor": "{{theme.colors.green}}", + "passedEndColor": "{{theme.colors.green}}", + "passedColor": "{{theme.colors.base4}}", + "warningEndColor": "{{theme.colors.darkYellow}}", + "warningColor": "{{theme.colors.base3}}", + "failedEndColor": "{{theme.color.errorRed}}", + "failedColor": "{{theme.color.red}}", + "progressColor": "{{theme.colors.blue}}", "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.base2}}", - "trackColor": "{{theme.colors.blue}}", - "warningColor": "{{theme.colors.darkYellow}}", - "warningEndColor": "{{theme.colors.base3}}" + "trackColor": "{{theme.colors.base4}}" }, "RadioButton": { "background": "{{theme.colors.base2}}", From 184c3a3a1e35239d7fc38eaaaa35c3556e592b90 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Mon, 19 Dec 2022 11:18:10 +0530 Subject: [PATCH 40/82] Updated Button arc. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 9ce7b3a..df78e81 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -36,7 +36,7 @@ "color": "{{theme.colors.base3.5}}" }, "Button": { - "arc": 6, + "arc": 10, "background": "{{theme.colors.base3.5}}", "default": { "endBackground": "{{theme.colors.base3.5}}", From d7a15a7cfaa19c316b4714726b79fbd1aefe95ea Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 12:10:28 +0530 Subject: [PATCH 41/82] Updated VersionControl design. --- theme/jetbrains/templates/theme.json | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index df78e81..00a0c40 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -698,14 +698,16 @@ } }, "GitLog": { - "localBranchIconColor": "{{theme.colors.yellow}}", + "headIconColor": "{{theme.colors.red}}", + "localBranchIconColor": "{{theme.colors.blue}}", "otherIconColor": "{{theme.colors.base6}}", - "remoteBranchIconColor": "{{theme.colors.base8}}", + "remoteBranchIconColor": "{{theme.colors.green}}", "tagIconColor": "{{theme.colors.base6}}" }, "HgLog": { - "branchIconColor": "{{theme.colors.yellow}}", + "headIconColor": "", "bookmarkIconColor": "{{theme.colors.yellow}}", + "branchIconColor": "{{theme.colors.yellow}}", "closedBranchIconColor": "{{theme.colors.base4}}", "localTagIconColor": "{{theme.colors.base6}}", "mqTagIconColor": "{{theme.colors.base6}}", @@ -714,13 +716,24 @@ }, "Log": { "Commit": { - "unmatchedForeground": "{{theme.colors.base6}}", - "currentBranchBackground": "{{theme.colors.base8x0c}}" + "currentBranchBackground": "{{theme.colors.base3.5}}", + "hoveredBackground": "{{theme.colors.base4}}", + "rowHeight": 20, + "selectionBackground": "{{theme.colors.base0}}", + "selectionForeground": "{{theme.colors.yellow}}", + "selectionInactiveBackground": "{{theme.colors.base3}}", + "selectionInactiveForeground": "{{theme.colors.yellow}}", + "unmatchedForeground": "{{theme.colors.base6}}" } }, + "MarkerPopup": { + "borderColor": "{{theme.colors.base4}}", + "borderInsets": "" + }, "RefLabel": { - "foreground": "{{theme.colors.yellow}}", - "backgroundBase": "{{theme.colors.base4}}" + "backgroundBase": "{{theme.colors.base4}}", + "backgroundBrightness": 0, + "foreground": "{{theme.colors.orange}}" } }, "Viewport": { From 4270ac4855971f026aa9cd9b051fe1d87c801ec3 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 12:30:32 +0530 Subject: [PATCH 42/82] Updated Tree design. --- theme/jetbrains/templates/theme.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 00a0c40..a5c172c 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -668,14 +668,18 @@ } }, "Tree": { - "background": "{{theme.colors.base1}}", + "background": "{{theme.colors.base2}}", + "errorForeground": "{{theme.colors.errorRed}}", "foreground": "{{theme.colors.base6}}", - "hash": "{{theme.colors.base2}}", + "hash": "{{theme.colors.base4}}", + "hoverBackground": "{{theme.colors.base3.5}}", + "hoverInactiveBackground": "{{theme.colors.base3}}", "modifiedItemForeground": "{{theme.colors.yellow}}", "rowHeight": 22, - "selectionBackground": "{{theme.colors.base2}}", + "selectionBackground": "{{theme.colors.base3.5}}", "selectionForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base2}}" + "selectionInactiveBackground": "{{theme.colors.base3}}", + "paintLines": true }, "UiDesigner": { "Panel": { From 1abdf89f16c7969e1483f2dc4dcc8bc42efcdcb6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 12:53:02 +0530 Subject: [PATCH 43/82] Minor Tree color update. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index a5c172c..bb536ce 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -674,7 +674,7 @@ "hash": "{{theme.colors.base4}}", "hoverBackground": "{{theme.colors.base3.5}}", "hoverInactiveBackground": "{{theme.colors.base3}}", - "modifiedItemForeground": "{{theme.colors.yellow}}", + "modifiedItemForeground": "{{theme.colors.blue}}", "rowHeight": 22, "selectionBackground": "{{theme.colors.base3.5}}", "selectionForeground": "{{theme.colors.yellow}}", From 812c82dfc84d5477e72cb228ee8c7556d7112166 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 13:03:35 +0530 Subject: [PATCH 44/82] Updated Seperator color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index bb536ce..d18d772 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -511,7 +511,7 @@ "startBackground": "{{theme.colors.yellow}}" }, "Separator": { - "separatorColor": "{{theme.colors.base8x0c}}" + "separatorColor": "{{theme.colors.base4}}" }, "SidePanel": { "background": "{{theme.colors.base1}}" From 1c1cd8ef9373d16869171ed10c81cdcbdc1cfdd4 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 13:54:07 +0530 Subject: [PATCH 45/82] Updated Panel color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index d18d772..d00cbae 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -367,7 +367,7 @@ "messageForeground": "{{theme.colors.base8}}" }, "Panel": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base1}}", "foreground": "{{theme.colors.base6}}", "mouseShortcutBackground": "" }, From 8185f84229fbe5405b7dc0b74e166885714c22ce Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 13:58:06 +0530 Subject: [PATCH 46/82] Reverted background color for Panel and Tree. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index d00cbae..87f7e55 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -367,7 +367,7 @@ "messageForeground": "{{theme.colors.base8}}" }, "Panel": { - "background": "{{theme.colors.base1}}", + "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.base6}}", "mouseShortcutBackground": "" }, @@ -668,7 +668,7 @@ } }, "Tree": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base1}}", "errorForeground": "{{theme.colors.errorRed}}", "foreground": "{{theme.colors.base6}}", "hash": "{{theme.colors.base4}}", From 0cc928b413e3f96713cb88efb234fe26d85c2ca7 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 14:00:12 +0530 Subject: [PATCH 47/82] Minor updates to Tree colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 87f7e55..21250a6 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -672,11 +672,11 @@ "errorForeground": "{{theme.colors.errorRed}}", "foreground": "{{theme.colors.base6}}", "hash": "{{theme.colors.base4}}", - "hoverBackground": "{{theme.colors.base3.5}}", + "hoverBackground": "{{theme.colors.base8x0c}}", "hoverInactiveBackground": "{{theme.colors.base3}}", "modifiedItemForeground": "{{theme.colors.blue}}", "rowHeight": 22, - "selectionBackground": "{{theme.colors.base3.5}}", + "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base3}}", "paintLines": true From f578a4ffd8f25d4e783197bcdc873d008ca4e4c6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 14:28:58 +0530 Subject: [PATCH 48/82] Added new color and updated the List bg color. --- colors/spectrum.yaml | 1 + theme/jetbrains/templates/theme.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index 3230091..eff748b 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -14,6 +14,7 @@ colors: # base colors base0: "#131313" base1: "#191919" + base1.5: "#202020" base2: "#222222" base3: "#292929" base3.5: "#363537" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 21250a6..b5fbba0 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -22,7 +22,7 @@ "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base3}}", "selectionInactiveForeground": "{{theme.colors.yellow}}", - "separatorColor": "{{theme.colors.base2}}" + "separatorColor": "{{theme.colors.base3.5}}" }, "ActionButton": { "hoverBackground": "{{theme.colors.base3}}", @@ -271,7 +271,7 @@ "Line": { "hoverBackground": "" }, - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base1.5}}", "foreground": "{{theme.colors.base8}}", "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", From 85abe36b616f49b875be8e0dc93988c1fbdf34f9 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 18:44:37 +0530 Subject: [PATCH 49/82] Re-updated the checkbox colors. --- colors/spectrum.yaml | 2 +- theme/jetbrains/templates/theme.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index eff748b..ae70336 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -17,7 +17,7 @@ colors: base1.5: "#202020" base2: "#222222" base3: "#292929" - base3.5: "#363537" + base3.5: "#363537" # This color needs to be modified such that it matches with base8x0c but is brighter than it (Lesser than base4). base4: "#525053" base5: "#69676c" base6: "#8b888f" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index b5fbba0..26bcf18 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -769,17 +769,17 @@ }, "icons": { "ColorPalette": { - "Checkbox.Background.Default.Dark": "{{theme.colors.base4}}", + "Checkbox.Background.Default.Dark": "{{theme.colors.base3}}", "Checkbox.Background.Disabled.Dark": "{{theme.colors.base1}}", - "Checkbox.Background.Selected.Dark": "{{theme.colors.base4}}", - "Checkbox.Border.Default.Dark": "{{theme.colors.base6}}", - "Checkbox.Border.Disabled.Dark": "{{theme.colors.base2}}", - "Checkbox.Border.Selected.Dark": "{{theme.colors.base6}}", + "Checkbox.Background.Selected.Dark": "{{theme.colors.base3}}", + "Checkbox.Border.Default.Dark": "{{theme.colors.base5}}", + "Checkbox.Border.Disabled.Dark": "{{theme.colors.base3}}", + "Checkbox.Border.Selected.Dark": "{{theme.colors.base5}}", "Checkbox.Focus.Thin.Default.Dark": "{{theme.colors.base3}}", "Checkbox.Focus.Thin.Selected.Dark": "{{theme.colors.base1}}", - "Checkbox.Focus.Wide.Dark": "{{theme.colors.orange}}", + "Checkbox.Focus.Wide.Dark": "{{theme.colors.blue}}", "Checkbox.Foreground.Disabled.Dark": "{{theme.colors.base6}}", - "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base9}}" + "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base8}}" } } } From 4069d7e18e391b0740817c70b9207c2c5e88942d Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 18:51:06 +0530 Subject: [PATCH 50/82] Updated TabbedPane colors. --- theme/jetbrains/templates/theme.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 26bcf18..c30496e 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -545,13 +545,14 @@ }, "TabbedPane": { "background": "{{theme.colors.base2}}", + "foreground": "{{theme.colors.base8}}", "contentAreaColor": "{{theme.colors.base4}}", "disabledForeground": "{{theme.colors.base4}}", "disabledUnderlineColor": "{{theme.colors.base4}}", - "focus": "{{theme.colors.base3}}", - "focusColor": "{{theme.colors.base3}}", - "foreground": "{{theme.colors.base8}}", + "focus": "{{theme.colors.base8x0c}}", + "focusColor": "{{theme.colors.base8x0c}}", "hoverColor": "{{theme.colors.base8x0c}}", + "tabSelectionArc": 1, "tabSelectionHeight": 2, "underlineColor": "{{theme.colors.yellow}}" }, From de48c993e895ffcd7cbd72443c1a7787ce8ac6b6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 18:56:54 +0530 Subject: [PATCH 51/82] Minor Button color update. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index c30496e..f5b325b 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -42,7 +42,7 @@ "endBackground": "{{theme.colors.base3.5}}", "endBorderColor": "{{theme.colors.base3.5}}", "foreground": "{{theme.colors.yellow}}", - "focusColor": "{{theme.colors.blue}}", + "focusColor": "{{theme.colors.yellow}}", "focusedBorderColor": "{{theme.colors.base3.5}}", "shadowColor": "{{theme.colors.base3.5}}", "startBackground": "{{theme.colors.base3.5}}", From 716d4cfbb00990d0e6298028ad7e5751ddcbec54 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 19:03:20 +0530 Subject: [PATCH 52/82] Added placeholder for missing keys. --- theme/jetbrains/templates/theme.json | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index f5b325b..b4f56bc 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -30,7 +30,29 @@ "pressedBackground": "{{theme.colors.darkBlue}}", "pressedBorderColor": "{{theme.colors.blue}}" }, - "Banner": {}, + "Banner": { + "warningBorderColor": "", + "warningBackground": "", + "successBorderColor": "", + "successBackground": "", + "infoBorderColor": "", + "infoBackground": "", + "errorBorderColor": "", + "errorBackground": "" + }, + "BigSpinner": { + "background": "" + }, + "Bookmark": { + "iconBackground": "", + "Mnemonic": { + "iconForeground": "" + }, + "MnemonicAssigned": { + "background": "", + "foreground": "" + } + }, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", "color": "{{theme.colors.base3.5}}" From 6ad58a70cc4fd1e978f0a57dfb4358462fe13e7a Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 20:00:21 +0530 Subject: [PATCH 53/82] Added more placeholders for missing keys. --- theme/jetbrains/templates/theme.json | 239 ++++++++++++++++++++++++++- 1 file changed, 235 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index b4f56bc..a5043c0 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -57,6 +57,9 @@ "ContrastBorderColor": "{{theme.colors.base8x0c}}", "color": "{{theme.colors.base3.5}}" }, + "Breakpoint": { + "iconHoverAlpha": "" + }, "Button": { "arc": 10, "background": "{{theme.colors.base3.5}}", @@ -97,6 +100,41 @@ "selectionBackground": "{{theme.colors.base3}}", "selectionForeground": "{{theme.colors.yellow}}" }, + "CodeWithMe": { + "AccessDisabled": { + "accessDot": "" + }, + "Avatar": { + "foreground": "", + "hover": "" + }, + "Users": { + "1": { + "Background": "", + "Foreground": "" + }, + "2": { + "Background": "", + "Foreground": "" + }, + "3": { + "Background": "", + "Foreground": "" + }, + "4": { + "Background": "", + "Foreground": "" + }, + "5": { + "Background": "", + "Foreground": "" + }, + "6": { + "Background": "", + "Foreground": "" + } + } + }, "ColorChooser": { "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.base8}}", @@ -140,6 +178,16 @@ "nonFocusedMask": "", "selectionInnerInsets": "" }, + "ComplexPopup": { + "Header": { + "background": "", + "insets": "" + }, + "TextField": { + "borderInsets": "", + "inputInsets": "" + } + }, "Component": { "arc": 10, "borderColor": "{{theme.colors.base4}}", @@ -247,6 +295,17 @@ "selectionForeground": "{{theme.colors.yellow}}", "selectionBackground": "{{theme.colors.base3}}" }, + "GotItTooltip": { + "foreground": "", + "background": "", + "linkForeground": "", + "borderColor": "", + "endBackground": "", + "endBorderColor": "", + "shortcutForeground": "", + "startBackground": "", + "startBorderColor": "" + }, "Group": { "disabledSeparatorColor": "{{theme.colors.base3}}", "separatorColor": "{{theme.colors.base3.5}}" @@ -258,6 +317,16 @@ "HelpTooltip": { "borderColor": "{{theme.colors.base2}}" }, + "IconBadge": { + "errorBackground": "", + "infoBackground": "", + "warningBackground": "", + "successBackground": "", + "borderWidth": "", + "dotRadius": "", + "dotX": "", + "dotY": "" + }, "InformationHint": { "borderColor": "{{theme.colors.base2}}" }, @@ -272,6 +341,14 @@ "infoForeground": "{{theme.colors.base6}}", "selectedForeground": "{{theme.colors.yellow}}" }, + "Lesson": { + "Badge": { + "newLessonBackground": "", + "newLessonForeground": "" + }, + "shortcutBackground": "", + "stepNumberForeground": "" + }, "Link": { "activeForeground": "{{theme.colors.yellow}}", "hoverForeground": "{{theme.colors.yellow}}", @@ -303,6 +380,9 @@ "hoverBackground": "", "hoverInactiveBackground": "" }, + "MainToolbar": { + "separatorColor": "" + }, "MemoryIndicator": { "allocatedBackground": "{{theme.colors.base0}}", "usedBackground": "{{theme.colors.errorRed}}" @@ -383,11 +463,52 @@ "iconOffsetSize": "", "linkForeground": "{{theme.colors.yellow}}" }, + "NotificationsToolwindow": { + "newNotification": { + "background": "", + "hoverBackground": "" + }, + "Notification": { + "hoverBackground": "" + } + }, + "OnePixelDivider": { + "background": "" + }, + "OptionButton": { + "default": { + "separatorColor": "" + }, + "separatorColor": "" + }, "OptionPane": { "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.base8}}", "messageForeground": "{{theme.colors.base8}}" }, + "PackageSearch": { + "PackagesList": { + "rowHeight": "" + }, + "PackageTag": { + "hoverBackground": "", + "background": "", + "foreground": "", + "selectedBackground": "", + "selectedForeground": "" + }, + "SearchResult": { + "background": "", + "hoverBackground": "", + "PackageTag": { + "hoverBackground": "", + "selectedForeground": "", + "selectedBackground": "", + "foreground": "", + "background": "" + } + } + }, "Panel": { "background": "{{theme.colors.base2}}", "foreground": "{{theme.colors.base6}}", @@ -506,6 +627,56 @@ "selectionBackground": "{{theme.colors.base3}}", "selectionForeground": "{{theme.colors.yellow}}" }, + "RunToolbar": { + "Debug": { + "activeBackground": "" + }, + "Profile": { + "activeBackground": "" + }, + "Run": { + "activeBackground": "" + } + }, + "RunWidget": { + "background": "", + "foreground": "", + "hoverBackground": "", + "separatorColor": "", + "pressedBackground": "", + "runningBackground": "" + }, + "ScrollBar": { + "background": "", + "hoverThumbBorderColor": "", + "hoverThumbColor": "", + "hoverTrackColor": "", + "thumb": "", + "thumbBorderColor": "", + "thumbColor": "", + "thumbDarkShadow": "", + "thumbHighlight": "", + "thumbShadow": "", + "trackHighlight": "", + "track": "", + "trackColor": "", + "Transparent": { + "trackColor": "", + "thumbColor": "", + "thumbBorderColor": "", + "hoverTrackColor": "", + "hoverThumbColor": "", + "hoverThumbBorderColor": "" + } + }, + "ScrollPane": { + "background": "", + "foreground": "" + }, + "SearchField": { + "errorBackground": "", + "errorForeground": "" + }, "SearchEverywhere": { "Advertiser": { "background": "{{theme.colors.base1}}", @@ -532,9 +703,28 @@ "endBackground": "{{theme.colors.yellow}}", "startBackground": "{{theme.colors.yellow}}" }, + "SearchOption": { + "selectedBackground": "", + "selectedHoveredBackground": "", + "selectedPressedBackground": "" + }, + "SegmentedButton": { + "focusedSelectedButtonColor": "", + "selectedButtonColor": "", + "selectedEndBorderColor": "", + "selectedStartBorderColor": "" + }, "Separator": { "separatorColor": "{{theme.colors.base4}}" }, + "Settings": { + "Spotlight": { + "borderColor": "" + } + }, + "SettingsTree": { + "rowHeight": "" + }, "SidePanel": { "background": "{{theme.colors.base1}}" }, @@ -546,6 +736,25 @@ "tickColor": "{{theme.colors.base3}}", "trackColor": "{{theme.colors.base3}}" }, + "Space": { + "Chat": { + "Emoji": { + "Picker": { + "hoverBackground": "" + } + }, + "Reaction": { + "background": "", + "hoverBackground": "" + } + }, + "Review": { + "acceptedOutline": "", + "diffAnchorBackground": "", + "waitForResponseOutline": "", + "workingOutline": "" + } + }, "SpeedSearch": { "background": "{{theme.colors.base4}}", "borderColor": "{{theme.colors.base2}}", @@ -562,6 +771,9 @@ "SplitPaneDivider": { "draggingColor": "{{theme.colors.base3}}" }, + "SshRemoteRun": { + "successfulConnectionInfoLabel": "" + }, "StatusBar": { "borderColor": "{{theme.colors.base8x0c}}" }, @@ -604,7 +816,9 @@ "focusCellBackground": "{{theme.colors.base3}}", "separatorColor": "{{theme.colors.base8x0c}}" }, - "textText": "{{theme.colors.base6}}", + "Tag": { + "background": "" + }, "TextArea": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", @@ -613,6 +827,9 @@ "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}" }, + "TextComponent": { + "selectionBackgroundInactive": "" + }, "TextField": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", @@ -629,6 +846,15 @@ "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}" }, + "textText": "{{theme.colors.base6}}", + "TipOfTheDay": { + "Image": { + "borderColor": "" + } + }, + "TitledBorder": { + "titleColor": "{{theme.colors.base6}}" + }, "TitlePane": { "background": "{{theme.colors.base1}}", "Button.hoverBackground": "{{theme.colors.base4}}", @@ -636,9 +862,6 @@ "infoForeground": "{{theme.colors.base6}}", "inactiveInfoForeground": "{{theme.colors.base6}}" }, - "TitledBorder": { - "titleColor": "{{theme.colors.base6}}" - }, "ToggleButton": { "borderColor": "{{theme.colors.base3}}", "buttonColor": "{{theme.colors.base8}}", @@ -712,6 +935,14 @@ "background": "{{theme.colors.base2}}" } }, + "UnattendedHostStatus": { + "dangerBackground": "", + "warningBackground": "", + "dangerForeground": "", + "normalBackground": "", + "normalForeground": "", + "warningForeground": "" + }, "ValidationTooltip": { "errorBackground": "{{theme.colors.base8x0c}}", "errorBorderColor": "{{theme.colors.base8x0c}}", From dde54f739a55a80be8916f7e67001964fc077bc3 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 20:45:35 +0530 Subject: [PATCH 54/82] Updated Bookmark colors. --- theme/jetbrains/templates/theme.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index a5043c0..44dc223 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -44,13 +44,22 @@ "background": "" }, "Bookmark": { - "iconBackground": "", + "iconBackground": "{{theme.colors.base2}}", "Mnemonic": { - "iconForeground": "" + "iconForeground": "{{theme.colors.base9}}" }, "MnemonicAssigned": { - "background": "", - "foreground": "" + "background": "{{theme.colors.red}}", + "foreground": "{{theme.colors.base0}}" + }, + "MnemonicAvailable": { + "background": "{{theme.colors.base2}}", + "borderColor": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base7}}" + }, + "MnemonicCurrent": { + "background": "{{theme.colors.green}}", + "foreground": "{{theme.colors.base0}}" } }, "Borders": { From c1ccf015b0925dab80b6b3c982ac35b2825e6fce Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:01:01 +0530 Subject: [PATCH 55/82] Minor Update to List colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 44dc223..21beac1 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -384,7 +384,7 @@ "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", - "selectionInactiveForeground": "{{theme.colors.orange}}", + "selectionInactiveForeground": "{{theme.colors.base6}}", "dropLineColor": "", "hoverBackground": "", "hoverInactiveBackground": "" From 77ad17e0ca3cf322cd240d0dd9ed9b2fe9e182ce Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:04:52 +0530 Subject: [PATCH 56/82] Updated Breakpoint colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 21beac1..3c13425 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -67,7 +67,7 @@ "color": "{{theme.colors.base3.5}}" }, "Breakpoint": { - "iconHoverAlpha": "" + "iconHoverAlpha": 0.55 }, "Button": { "arc": 10, From be31f3961b493bd7a87a8cea52014bb020a48d0c Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:14:43 +0530 Subject: [PATCH 57/82] Debugger color updates. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 3c13425..2b29842 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -227,8 +227,8 @@ "evaluatingExpressionForeground": "{{theme.colors.base6}}", "exceptionForeground": "{{theme.colors.errorRed}}", "modifyingValueForeground": "{{theme.colors.yellow}}", - "typeForeground": "{{theme.colors.base5}}", - "valueForeground": "{{theme.colors.base5}}" + "typeForeground": "{{theme.colors.base6}}", + "valueForeground": "{{theme.colors.base8}}" } }, "DebuggerTabs": { From 4888f1e232d09541fa570eba0a7622a8daa24424 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:25:19 +0530 Subject: [PATCH 58/82] Updated GutterToolTip colors. (For Overrides and Implements) (Line Number Gutter). --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 2b29842..4224589 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -320,8 +320,8 @@ "separatorColor": "{{theme.colors.base3.5}}" }, "GutterTooltip": { - "infoForeground": "{{theme.colors.base8}}", - "lineSeparatorColor": "{{theme.colors.base2}}" + "infoForeground": "{{theme.colors.base9}}", + "lineSeparatorColor": "{{theme.colors.base8x0c}}" }, "HelpTooltip": { "borderColor": "{{theme.colors.base2}}" From 1eff8ccc679851122a3d7c4dd9223c9c1b91c6f0 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:33:20 +0530 Subject: [PATCH 59/82] Updated errorRed color and updated IconBadge colors. --- colors/spectrum.yaml | 2 +- theme/jetbrains/templates/theme.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index ae70336..b1976d9 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -3,7 +3,7 @@ name: Monokai Pro (Filter Spectrum) colors: # primary colors red: "#fc618d" - errorRed: "#990909" + errorRed: "#b50505" orange: "#fd9353" yellow: "#fce566" darkYellow: "#d7a916" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 4224589..e640fc6 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -327,12 +327,12 @@ "borderColor": "{{theme.colors.base2}}" }, "IconBadge": { - "errorBackground": "", - "infoBackground": "", - "warningBackground": "", - "successBackground": "", - "borderWidth": "", - "dotRadius": "", + "errorBackground": "{{theme.colors.errorRed}}", + "infoBackground": "{{theme.colors.blue}}", + "warningBackground": "{{theme.colors.yellow}}", + "successBackground": "{{theme.colors.green}}", + "borderWidth": 1, + "dotRadius": 5, "dotX": "", "dotY": "" }, From 1cdac0207074dae0f33d480091d342fd7df6141e Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:40:27 +0530 Subject: [PATCH 60/82] Updated Label colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index e640fc6..ed05250 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -346,7 +346,7 @@ "background": "{{theme.colors.base2}}", "disabledForeground": "{{theme.colors.base4}}", "disabledText": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base7}}", "infoForeground": "{{theme.colors.base6}}", "selectedForeground": "{{theme.colors.yellow}}" }, From bddfb31bb7895b552b6a0fed7bd6e56e2f9768d9 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 21:48:40 +0530 Subject: [PATCH 61/82] Updated MainToolbar color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index ed05250..bfc4553 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -390,7 +390,7 @@ "hoverInactiveBackground": "" }, "MainToolbar": { - "separatorColor": "" + "separatorColor": "{{theme.colors.base4}}" }, "MemoryIndicator": { "allocatedBackground": "{{theme.colors.base0}}", From 332f9cfac1534a7f38fbc07b881c10af11143205 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:08:20 +0530 Subject: [PATCH 62/82] Updated ScrollBar colors. --- theme/jetbrains/templates/theme.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index bfc4553..9172e18 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -670,12 +670,12 @@ "track": "", "trackColor": "", "Transparent": { - "trackColor": "", - "thumbColor": "", - "thumbBorderColor": "", - "hoverTrackColor": "", - "hoverThumbColor": "", - "hoverThumbBorderColor": "" + "trackColor": "{{theme.colors.base1.5}}", + "thumbColor": "{{theme.colors.base3.5}}", + "thumbBorderColor": "{{theme.colors.base3.5}}", + "hoverTrackColor": "{{theme.colors.base1}}", + "hoverThumbColor": "{{theme.colors.base4}}", + "hoverThumbBorderColor": "{{theme.colors.base4}}" } }, "ScrollPane": { From 218d8a89253c8764459279d17599d1e3b549aa47 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:26:46 +0530 Subject: [PATCH 63/82] Updated SegmentedButton colors. --- theme/jetbrains/templates/theme.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 9172e18..209e2a0 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -718,10 +718,10 @@ "selectedPressedBackground": "" }, "SegmentedButton": { - "focusedSelectedButtonColor": "", - "selectedButtonColor": "", - "selectedEndBorderColor": "", - "selectedStartBorderColor": "" + "focusedSelectedButtonColor": "{{theme.colors.base4}}", + "selectedButtonColor": "{{theme.colors.base4}}", + "selectedEndBorderColor": "{{theme.colors.base6}}", + "selectedStartBorderColor": "{{theme.colors.base6}}" }, "Separator": { "separatorColor": "{{theme.colors.base4}}" From 5fbcc04211922d6e5b38602edd36116bce7b0019 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:34:43 +0530 Subject: [PATCH 64/82] Updated errorRed color. --- colors/spectrum.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index b1976d9..b409e28 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -3,7 +3,7 @@ name: Monokai Pro (Filter Spectrum) colors: # primary colors red: "#fc618d" - errorRed: "#b50505" + errorRed: "#a10909" orange: "#fd9353" yellow: "#fce566" darkYellow: "#d7a916" From 840cb8e62e8391a5fd8faa9f56b8d55ce41d3a0a Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:37:02 +0530 Subject: [PATCH 65/82] Updated Settings colors and SettingsTree design. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 209e2a0..3fc024d 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -728,11 +728,11 @@ }, "Settings": { "Spotlight": { - "borderColor": "" + "borderColor": "{{theme.colors.green}}" } }, "SettingsTree": { - "rowHeight": "" + "rowHeight": 22 }, "SidePanel": { "background": "{{theme.colors.base1}}" From 9116b582725d1790e081d6c79ad9b8fd606d5e42 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:50:34 +0530 Subject: [PATCH 66/82] Updated Slider colors. --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 3fc024d..34db172 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -739,11 +739,11 @@ }, "Slider": { "background": "{{theme.colors.base2}}", - "buttonBorderColor": "{{theme.colors.yellow}}", + "buttonBorderColor": "{{theme.colors.orange}}", "buttonColor": "{{theme.colors.yellow}}", "foreground": "{{theme.colors.base8}}", "tickColor": "{{theme.colors.base3}}", - "trackColor": "{{theme.colors.base3}}" + "trackColor": "{{theme.colors.base3.5}}" }, "Space": { "Chat": { From c15e88a19d30538b412c44b12ff63b1c7c74e052 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 22:55:25 +0530 Subject: [PATCH 67/82] Updated SpeedSearch colors. --- theme/jetbrains/templates/theme.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 34db172..9b71c68 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -765,10 +765,10 @@ } }, "SpeedSearch": { - "background": "{{theme.colors.base4}}", - "borderColor": "{{theme.colors.base2}}", - "errorForeground": "{{theme.colors.base8}}", - "foreground": "{{theme.colors.base8}}" + "background": "{{theme.colors.base3.5}}", + "borderColor": "{{theme.colors.base4}}", + "errorForeground": "{{theme.colors.red}}", + "foreground": "{{theme.colors.base9}}" }, "Spinner": { "background": "{{theme.colors.base2}}" From 15263a56322bae4b90c09f9f8cba26d7c43838ef Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 23:05:00 +0530 Subject: [PATCH 68/82] Re-updated VersionControl colors. --- theme/jetbrains/templates/theme.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 9b71c68..514cd9a 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -983,12 +983,12 @@ }, "Log": { "Commit": { - "currentBranchBackground": "{{theme.colors.base3.5}}", - "hoveredBackground": "{{theme.colors.base4}}", + "currentBranchBackground": "{{theme.colors.base2}}", + "hoveredBackground": "{{theme.colors.base3.5}}", "rowHeight": 20, - "selectionBackground": "{{theme.colors.base0}}", + "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base3}}", + "selectionInactiveBackground": "{{theme.colors.base1}}", "selectionInactiveForeground": "{{theme.colors.yellow}}", "unmatchedForeground": "{{theme.colors.base6}}" } From 9825aa17ed39e6e6b2140e643f2b73aa6957bd56 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 23:25:44 +0530 Subject: [PATCH 69/82] Updated generic color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 514cd9a..b53d890 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -7,7 +7,7 @@ "*": { "acceleratorSelectionForeground": "{{theme.colors.yellow}}", "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base8x0c}}", + "borderColor": "{{theme.colors.base3.5}}", "disabledBackground": "{{theme.colors.base1}}", "disabledForeground": "{{theme.colors.base4}}", "disabledText": "{{theme.colors.base4}}", From 597df92b5f7ab5b7666bbf9138f5d8dd76ed2751 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Tue, 20 Dec 2022 23:29:27 +0530 Subject: [PATCH 70/82] Revert EditorPane foreground color. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index b53d890..868f5b7 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -267,7 +267,7 @@ "EditorPane": { "background": "{{theme.colors.base1}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.blue}}", + "foreground": "{{theme.colors.base8}}", "inactiveBackground": "{{theme.colors.base3}}", "inactiveForeground": "{{theme.colors.base2}}", "selectionBackground": "{{theme.colors.base1}}", From dd5a784b65356cd393037b5604da5390350845db Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Fri, 23 Dec 2022 12:39:38 +0530 Subject: [PATCH 71/82] Added new darGreen color and updated RunWidget colors. --- colors/spectrum.yaml | 1 + theme/jetbrains/templates/theme.json | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index b409e28..6027074 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -8,6 +8,7 @@ colors: yellow: "#fce566" darkYellow: "#d7a916" green: "#7bd88f" + darkGreen: "#117e00" blue: "#5ad4e6" darkBlue: "#0050bb" purple: "#948ae3" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 868f5b7..7f26e08 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -648,12 +648,12 @@ } }, "RunWidget": { - "background": "", - "foreground": "", - "hoverBackground": "", - "separatorColor": "", - "pressedBackground": "", - "runningBackground": "" + "background": "{{theme.colors.darkBlue}}", + "foreground": "{{theme.colors.base9}}", + "hoverBackground": "{{theme.colors.base8x0c}}", + "separatorColor": "{{theme.colors.blue}}", + "pressedBackground": "{{theme.colors.base8x0c}}", + "runningBackground": "{{theme.colors.darkGreen}}" }, "ScrollBar": { "background": "", From f0f3ce00ee0560bcb4b9effaed291fe82fff5cd6 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Fri, 23 Dec 2022 12:55:12 +0530 Subject: [PATCH 72/82] Removed deprecated keys. --- theme/jetbrains/templates/theme.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 7f26e08..8d705f8 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -309,11 +309,7 @@ "background": "", "linkForeground": "", "borderColor": "", - "endBackground": "", - "endBorderColor": "", - "shortcutForeground": "", - "startBackground": "", - "startBorderColor": "" + "shortcutForeground": "" }, "Group": { "disabledSeparatorColor": "{{theme.colors.base3}}", From 90facc099269db4dd5be680c8fbce50dd6dafd8f Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Fri, 23 Dec 2022 12:55:42 +0530 Subject: [PATCH 73/82] Code rearrangement. --- theme/jetbrains/templates/theme.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 8d705f8..f3a3b6c 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -149,9 +149,6 @@ "foreground": "{{theme.colors.base8}}", "swatchesDefaultRecentColor": "{{theme.colors.base8}}" }, - "ComboBoxButton": { - "background": "{{theme.colors.base8x0c}}" - }, "ComboBox": { "ArrowButton": { "background": "{{theme.colors.base2}}", @@ -167,6 +164,9 @@ "selectionBackground": "{{theme.colors.blue}}", "selectionForeground": "{{theme.colors.base1}}" }, + "ComboBoxButton": { + "background": "{{theme.colors.base8x0c}}" + }, "ComboPopup": { "border": "0,0,0,0,000000" }, From 6976a19d51ee911beff0ab7518103f8c4142a9de Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Fri, 23 Dec 2022 13:12:43 +0530 Subject: [PATCH 74/82] Updated ComplexPopup colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index f3a3b6c..2b09feb 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -189,7 +189,7 @@ }, "ComplexPopup": { "Header": { - "background": "", + "background": "{{theme.colors.base8x0c}}", "insets": "" }, "TextField": { From 90302b49ded491045bba0a90fe9283669912ada5 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Fri, 23 Dec 2022 13:27:18 +0530 Subject: [PATCH 75/82] Updated TipOfTheDay colors. --- theme/jetbrains/templates/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index 2b09feb..c9a0808 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -854,7 +854,7 @@ "textText": "{{theme.colors.base6}}", "TipOfTheDay": { "Image": { - "borderColor": "" + "borderColor": "{{theme.colors.base3.5}}" } }, "TitledBorder": { From 215924ccb0dfc02c0e4d0892178c87f216098a27 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 24 Dec 2022 12:16:37 +0530 Subject: [PATCH 76/82] Updated ristretto colors. --- colors/ristretto.yaml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/colors/ristretto.yaml b/colors/ristretto.yaml index 6e3903a..5ef2cdf 100644 --- a/colors/ristretto.yaml +++ b/colors/ristretto.yaml @@ -3,20 +3,27 @@ name: Monokai Pro (Filter Ristretto) colors: # primary colors red: "#fd6883" + errorRed: "#990909" orange: "#f38d70" yellow: "#f9cc6c" + darkYellow: "#d7a916" green: "#adda78" + darkGreen: "#117e00" blue: "#85dacc" + darkBlue: "#0050bb" purple: "#a8a9eb" # base colors - base0: "#191515" + base0: "#231818" base1: "#211c1c" + base1.5: "#231c1c" base2: "#2c2525" - base3: "#403838" + base3: "#312c2c" + base3.5: "#4d4141" base4: "#5b5353" base5: "#72696a" base6: "#8c8384" - base7: "#c3b7b8" - base8: "#fff1f3" + base7: "#b7aaab" + base8: "#d7c5c6" + base9: "#ffdedd" # variants - base8x0c: "#352e2e" \ No newline at end of file + base8x0c: "#3d3535" \ No newline at end of file From 631999c30b81550e65499fd7375986754583f471 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 24 Dec 2022 12:44:46 +0530 Subject: [PATCH 77/82] Updated octagon colors. --- colors/octagon.yaml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/colors/octagon.yaml b/colors/octagon.yaml index 67d0e48..1cfdc8b 100644 --- a/colors/octagon.yaml +++ b/colors/octagon.yaml @@ -3,20 +3,27 @@ name: Monokai Pro (Filter Octagon) colors: # primary colors red: "#ff657a" + errorRed: "#990909" orange: "#ff9b5e" yellow: "#ffd76d" + darkYellow: "#d7a916" green: "#bad761" + darkGreen: "#117e00" blue: "#9cd1bb" + darkBlue: "#0050bb" purple: "#c39ac9" # base colors - base0: "#161821" - base1: "#1e1f2b" + base0: "#141225" + base1: "#1c1a2c" + base1.5: "#1f1f33" base2: "#282a3a" - base3: "#3a3d4b" - base4: "#535763" + base3: "#2f3244" + base3.5: "#3d4252" + base4: "#58636c" base5: "#696d77" base6: "#767b81" - base7: "#b2b9bd" - base8: "#eaf2f1" + base7: "#8b989d" + base8: "#b3c1c4" + base9: "#eaf2f1" # variants base8x0c: "#303342" \ No newline at end of file From a2a0dc129065dc9dcaad3400d84a8b27b160f738 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 24 Dec 2022 12:56:43 +0530 Subject: [PATCH 78/82] Updated machine colors. --- colors/machine.yaml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/colors/machine.yaml b/colors/machine.yaml index 33466bf..5003a67 100644 --- a/colors/machine.yaml +++ b/colors/machine.yaml @@ -3,20 +3,27 @@ name: Monokai Pro (Filter Machine) colors: # primary colors red: "#ff6d7e" + errorRed: "#990909" orange: "#ffb270" yellow: "#ffed72" + darkYellow: "#d7a916" green: "#a2e57b" + darkGreen: "#117e00" blue: "#7cd5f1" + darkBlue: "#0050bb" purple: "#baa0f8" # base colors - base0: "#161b1e" - base1: "#1d2528" + base0: "#131e1f" + base1: "#1f262a" + base1.5: "#212a2d" base2: "#273136" - base3: "#3a4449" - base4: "#545f62" + base3: "#293336" + base3.5: "#3f4c50" + base4: "#505d60" base5: "#6b7678" base6: "#798384" - base7: "#b8c4c3" - base8: "#f2fffc" + base7: "#98abaa" + base8: "#c8d9d5" + base9: "#f2fffc" # variants base8x0c: "#303a3e" \ No newline at end of file From 126bbd6e62345948159b809b95bfce05deffff51 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 24 Dec 2022 13:12:43 +0530 Subject: [PATCH 79/82] Updated default colors. --- colors/default.yaml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/colors/default.yaml b/colors/default.yaml index 4a87fe3..63d6ab9 100644 --- a/colors/default.yaml +++ b/colors/default.yaml @@ -4,20 +4,27 @@ name: Monokai Pro colors: # primary colors red: "#ff6188" + errorRed: "#990909" orange: "#fc9867" yellow: "#ffd866" + darkYellow: "#d7a916" green: "#a9dc76" + darkGreen: "#117e00" blue: "#78dce8" + darkBlue: "#0050bb" purple: "#ab9df2" # base colors, sorted from darkest to lightest - base0: "#19181a" - base1: "#221f22" + base0: "#120f13" + base1: "#221d23" + base1.5: "#251f26" base2: "#2d2a2e" - base3: "#403e41" - base4: "#5b595c" + base3: "#322e33" + base3.5: "#403b41" + base4: "#605f62" base5: "#727072" base6: "#939293" - base7: "#c1c0c0" - base8: "#fcfcfa" + base7: "#aba5ab" + base8: "#cecec3" + base9: "#fcfcfa" # variants (for when transparency isn't supported) base8x0c: "#363337" # using base2 as bg From 6b1d07311963c67a5ae9a67d031af8719015506b Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 24 Dec 2022 13:28:03 +0530 Subject: [PATCH 80/82] Updated classic colors. --- colors/classic.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/colors/classic.yaml b/colors/classic.yaml index bdd490c..ef1628d 100644 --- a/colors/classic.yaml +++ b/colors/classic.yaml @@ -4,20 +4,27 @@ name: Monokai Pro (Classic) colors: # primary colors red: "#f92672" + errorRed: "#990909" orange: "#fd971f" yellow: "#a9dc76" + darkYellow: "#5aa90e" green: "#a6e22e" + darkGreen: "#117e00" blue: "#66d9ef" + darkBlue: "#0050bb" purple: "#ab9df2" # base colors, sorted from darkest to lightest - base0: "#161613" - base1: "#1d1e19" + base0: "#13130f" + base1: "#1e1e1a" + base1.5: "#20211c" base2: "#272822" - base3: "#3b3c35" - base4: "#57584f" + base3: "#2c2d27" + base3.5: "#3c3d35" + base4: "#515247" base5: "#6e7066" - base6: "#919288" - base7: "#c0c1b5" - base8: "#fdfff1" + base6: "#8b8c81" + base7: "#b1b2a5" + base8: "#dadacf" + base9: "#fdffed" # variants (for when transparency isn't supported) base8x0c: "#32332c" # using base2 as bg From c68a4d5f5a32f32a1662e3fdeebff99a4d05b260 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sat, 1 Apr 2023 13:38:20 +0530 Subject: [PATCH 81/82] Update theme/jetbrains/templates/theme.json Co-authored-by: Yash Ladha <18033231+yashLadha@users.noreply.github.com> --- theme/jetbrains/templates/theme.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index c9a0808..bb53e2d 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -610,8 +610,8 @@ "passedColor": "{{theme.colors.base4}}", "warningEndColor": "{{theme.colors.darkYellow}}", "warningColor": "{{theme.colors.base3}}", - "failedEndColor": "{{theme.color.errorRed}}", - "failedColor": "{{theme.color.red}}", + "failedEndColor": "{{theme.colors.errorRed}}", + "failedColor": "{{theme.colors.red}}", "progressColor": "{{theme.colors.blue}}", "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.base2}}", From 2d6209a6eccfe6a16ad2de38f3ca2031d2bbffb4 Mon Sep 17 00:00:00 2001 From: Hikaru Hokkyokusei Date: Sun, 2 Apr 2023 18:55:02 +0530 Subject: [PATCH 82/82] Added few placeholders under icons. Rename few colors to remove the dot from names. --- colors/classic.yaml | 20 +- colors/default.yaml | 20 +- colors/machine.yaml | 20 +- colors/octagon.yaml | 20 +- colors/ristretto.yaml | 20 +- colors/spectrum.yaml | 20 +- theme/jetbrains/templates/theme.json | 618 ++++++++++++++------------- 7 files changed, 378 insertions(+), 360 deletions(-) diff --git a/colors/classic.yaml b/colors/classic.yaml index ef1628d..b1a0e81 100644 --- a/colors/classic.yaml +++ b/colors/classic.yaml @@ -16,15 +16,15 @@ colors: # base colors, sorted from darkest to lightest base0: "#13130f" base1: "#1e1e1a" - base1.5: "#20211c" - base2: "#272822" - base3: "#2c2d27" - base3.5: "#3c3d35" - base4: "#515247" - base5: "#6e7066" - base6: "#8b8c81" - base7: "#b1b2a5" - base8: "#dadacf" - base9: "#fdffed" + base2: "#20211c" + base3: "#272822" + base4: "#2c2d27" + base5: "#3c3d35" + base6: "#515247" + base7: "#6e7066" + base8: "#8b8c81" + base9: "#b1b2a5" + base10: "#dadacf" + base11: "#fdffed" # variants (for when transparency isn't supported) base8x0c: "#32332c" # using base2 as bg diff --git a/colors/default.yaml b/colors/default.yaml index 63d6ab9..0f610f0 100644 --- a/colors/default.yaml +++ b/colors/default.yaml @@ -16,15 +16,15 @@ colors: # base colors, sorted from darkest to lightest base0: "#120f13" base1: "#221d23" - base1.5: "#251f26" - base2: "#2d2a2e" - base3: "#322e33" - base3.5: "#403b41" - base4: "#605f62" - base5: "#727072" - base6: "#939293" - base7: "#aba5ab" - base8: "#cecec3" - base9: "#fcfcfa" + base2: "#251f26" + base3: "#2d2a2e" + base4: "#322e33" + base5: "#403b41" + base6: "#605f62" + base7: "#727072" + base8: "#939293" + base9: "#aba5ab" + base10: "#cecec3" + base11: "#fcfcfa" # variants (for when transparency isn't supported) base8x0c: "#363337" # using base2 as bg diff --git a/colors/machine.yaml b/colors/machine.yaml index 5003a67..e25da69 100644 --- a/colors/machine.yaml +++ b/colors/machine.yaml @@ -15,15 +15,15 @@ colors: # base colors base0: "#131e1f" base1: "#1f262a" - base1.5: "#212a2d" - base2: "#273136" - base3: "#293336" - base3.5: "#3f4c50" - base4: "#505d60" - base5: "#6b7678" - base6: "#798384" - base7: "#98abaa" - base8: "#c8d9d5" - base9: "#f2fffc" + base2: "#212a2d" + base3: "#273136" + base4: "#293336" + base5: "#3f4c50" + base6: "#505d60" + base7: "#6b7678" + base8: "#798384" + base9: "#98abaa" + base10: "#c8d9d5" + base11: "#f2fffc" # variants base8x0c: "#303a3e" \ No newline at end of file diff --git a/colors/octagon.yaml b/colors/octagon.yaml index 1cfdc8b..5ad51c5 100644 --- a/colors/octagon.yaml +++ b/colors/octagon.yaml @@ -15,15 +15,15 @@ colors: # base colors base0: "#141225" base1: "#1c1a2c" - base1.5: "#1f1f33" - base2: "#282a3a" - base3: "#2f3244" - base3.5: "#3d4252" - base4: "#58636c" - base5: "#696d77" - base6: "#767b81" - base7: "#8b989d" - base8: "#b3c1c4" - base9: "#eaf2f1" + base2: "#1f1f33" + base3: "#282a3a" + base4: "#2f3244" + base5: "#3d4252" + base6: "#58636c" + base7: "#696d77" + base8: "#767b81" + base9: "#8b989d" + base10: "#b3c1c4" + base11: "#eaf2f1" # variants base8x0c: "#303342" \ No newline at end of file diff --git a/colors/ristretto.yaml b/colors/ristretto.yaml index 5ef2cdf..cd866b9 100644 --- a/colors/ristretto.yaml +++ b/colors/ristretto.yaml @@ -15,15 +15,15 @@ colors: # base colors base0: "#231818" base1: "#211c1c" - base1.5: "#231c1c" - base2: "#2c2525" - base3: "#312c2c" - base3.5: "#4d4141" - base4: "#5b5353" - base5: "#72696a" - base6: "#8c8384" - base7: "#b7aaab" - base8: "#d7c5c6" - base9: "#ffdedd" + base2: "#231c1c" + base3: "#2c2525" + base4: "#312c2c" + base5: "#4d4141" + base6: "#5b5353" + base7: "#72696a" + base8: "#8c8384" + base9: "#b7aaab" + base10: "#d7c5c6" + base11: "#ffdedd" # variants base8x0c: "#3d3535" \ No newline at end of file diff --git a/colors/spectrum.yaml b/colors/spectrum.yaml index 6027074..8328b75 100644 --- a/colors/spectrum.yaml +++ b/colors/spectrum.yaml @@ -15,15 +15,15 @@ colors: # base colors base0: "#131313" base1: "#191919" - base1.5: "#202020" - base2: "#222222" - base3: "#292929" - base3.5: "#363537" # This color needs to be modified such that it matches with base8x0c but is brighter than it (Lesser than base4). - base4: "#525053" - base5: "#69676c" - base6: "#8b888f" - base7: "#bab6c0" - base8: "#cdcdcd" - base9: "#f7f1ff" + base2: "#202020" + base3: "#222222" + base4: "#292929" + base5: "#363537" # This color needs to be modified such that it matches with base8x0c but is brighter than it (Lesser than base4). + base6: "#525053" + base7: "#69676c" + base8: "#8b888f" + base9: "#bab6c0" + base10: "#cdcdcd" + base11: "#f7f1ff" # variants base8x0c: "#2b2b2b" diff --git a/theme/jetbrains/templates/theme.json b/theme/jetbrains/templates/theme.json index bb53e2d..dbfeac1 100644 --- a/theme/jetbrains/templates/theme.json +++ b/theme/jetbrains/templates/theme.json @@ -6,27 +6,27 @@ "ui": { "*": { "acceleratorSelectionForeground": "{{theme.colors.yellow}}", - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base3.5}}", + "background": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base5}}", "disabledBackground": "{{theme.colors.base1}}", - "disabledForeground": "{{theme.colors.base4}}", - "disabledText": "{{theme.colors.base4}}", - "focusColor": "{{theme.colors.base4}}", + "disabledForeground": "{{theme.colors.base6}}", + "disabledText": "{{theme.colors.base6}}", + "focusColor": "{{theme.colors.base6}}", "focusedBorderColor": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", + "foreground": "{{theme.colors.base10}}", "inactiveBackground": "{{theme.colors.base1}}", - "inactiveForeground": "{{theme.colors.base6}}", - "infoForeground": "{{theme.colors.base6}}", - "selectionBackground": "{{theme.colors.base3}}", - "selectionBackgroundInactive": "{{theme.colors.base3}}", + "inactiveForeground": "{{theme.colors.base8}}", + "infoForeground": "{{theme.colors.base8}}", + "selectionBackground": "{{theme.colors.base4}}", + "selectionBackgroundInactive": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base3}}", + "selectionInactiveBackground": "{{theme.colors.base4}}", "selectionInactiveForeground": "{{theme.colors.yellow}}", - "separatorColor": "{{theme.colors.base3.5}}" + "separatorColor": "{{theme.colors.base5}}" }, "ActionButton": { - "hoverBackground": "{{theme.colors.base3}}", - "hoverBorderColor": "{{theme.colors.base6}}", + "hoverBackground": "{{theme.colors.base4}}", + "hoverBorderColor": "{{theme.colors.base8}}", "pressedBackground": "{{theme.colors.darkBlue}}", "pressedBorderColor": "{{theme.colors.blue}}" }, @@ -44,18 +44,18 @@ "background": "" }, "Bookmark": { - "iconBackground": "{{theme.colors.base2}}", + "iconBackground": "{{theme.colors.base3}}", "Mnemonic": { - "iconForeground": "{{theme.colors.base9}}" + "iconForeground": "{{theme.colors.base11}}" }, "MnemonicAssigned": { "background": "{{theme.colors.red}}", "foreground": "{{theme.colors.base0}}" }, "MnemonicAvailable": { - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base7}}" + "background": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base9}}" }, "MnemonicCurrent": { "background": "{{theme.colors.green}}", @@ -64,49 +64,49 @@ }, "Borders": { "ContrastBorderColor": "{{theme.colors.base8x0c}}", - "color": "{{theme.colors.base3.5}}" + "color": "{{theme.colors.base5}}" }, "Breakpoint": { "iconHoverAlpha": 0.55 }, "Button": { "arc": 10, - "background": "{{theme.colors.base3.5}}", + "background": "{{theme.colors.base5}}", "default": { - "endBackground": "{{theme.colors.base3.5}}", - "endBorderColor": "{{theme.colors.base3.5}}", + "endBackground": "{{theme.colors.base5}}", + "endBorderColor": "{{theme.colors.base5}}", "foreground": "{{theme.colors.yellow}}", "focusColor": "{{theme.colors.yellow}}", - "focusedBorderColor": "{{theme.colors.base3.5}}", - "shadowColor": "{{theme.colors.base3.5}}", - "startBackground": "{{theme.colors.base3.5}}", - "startBorderColor": "{{theme.colors.base3.5}}" + "focusedBorderColor": "{{theme.colors.base5}}", + "shadowColor": "{{theme.colors.base5}}", + "startBackground": "{{theme.colors.base5}}", + "startBorderColor": "{{theme.colors.base5}}" }, - "disabledBorderColor": "{{theme.colors.base3.5}}", - "disabledText": "{{theme.colors.base6}}", - "endBackground": "{{theme.colors.base3.5}}", - "endBorderColor": "{{theme.colors.base3.5}}", + "disabledBorderColor": "{{theme.colors.base5}}", + "disabledText": "{{theme.colors.base8}}", + "endBackground": "{{theme.colors.base5}}", + "endBorderColor": "{{theme.colors.base5}}", "focusedBorderColor": "{{theme.colors.darkBlue}}", - "foreground": "{{theme.colors.base9}}", - "shadowColor": "{{theme.colors.base3.5}}", + "foreground": "{{theme.colors.base11}}", + "shadowColor": "{{theme.colors.base5}}", "shadowWidth": 0, - "startBackground": "{{theme.colors.base3.5}}", - "startBorderColor": "{{theme.colors.base3.5}}" + "startBackground": "{{theme.colors.base5}}", + "startBorderColor": "{{theme.colors.base5}}" }, "CheckBox": { - "background": "{{theme.colors.base2}}", - "disabledText": "{{theme.colors.base3.5}}", - "foreground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base3}}", + "disabledText": "{{theme.colors.base5}}", + "foreground": "{{theme.colors.base10}}", "select": "{{theme.colors.orange}}" }, "CheckBoxMenuItem": { - "acceleratorForeground": "{{theme.colors.base6}}", - "acceleratorSelectionForeground": "{{theme.colors.base6}}", - "background": "{{theme.colors.base2}}", - "disabledBackground": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "selectionBackground": "{{theme.colors.base3}}", + "acceleratorForeground": "{{theme.colors.base8}}", + "acceleratorSelectionForeground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base3}}", + "disabledBackground": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}" }, "CodeWithMe": { @@ -145,28 +145,28 @@ } }, "ColorChooser": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base8}}", - "swatchesDefaultRecentColor": "{{theme.colors.base8}}" + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base10}}", + "swatchesDefaultRecentColor": "{{theme.colors.base10}}" + }, + "ComboBoxButton": { + "background": "{{theme.colors.base8x0c}}" }, "ComboBox": { "ArrowButton": { - "background": "{{theme.colors.base2}}", - "nonEditableBackground": "{{theme.colors.base2}}", - "iconColor": "{{theme.colors.base8}}", - "disabledIconColor": "{{theme.colors.base3.5}}" + "background": "{{theme.colors.base3}}", + "nonEditableBackground": "{{theme.colors.base3}}", + "iconColor": "{{theme.colors.base10}}", + "disabledIconColor": "{{theme.colors.base5}}" }, "background": "{{theme.colors.base8x0c}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", "modifiedItemForeground": "{{theme.colors.blue}}", "nonEditableBackground": "{{theme.colors.base8x0c}}", "selectionBackground": "{{theme.colors.blue}}", "selectionForeground": "{{theme.colors.base1}}" }, - "ComboBoxButton": { - "background": "{{theme.colors.base8x0c}}" - }, "ComboPopup": { "border": "0,0,0,0,000000" }, @@ -175,15 +175,15 @@ "insets": "" }, "Advertiser": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "borderInsets": "", "fontSizeOffset": "", - "foreground": "{{theme.colors.base7}}" + "foreground": "{{theme.colors.base9}}" }, "foreground": "{{theme.colors.red}}", "matchForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base3}}", - "selectionBackground": "{{theme.colors.base3}}", + "selectionInactiveBackground": "{{theme.colors.base4}}", + "selectionBackground": "{{theme.colors.base4}}", "nonFocusedMask": "", "selectionInnerInsets": "" }, @@ -199,14 +199,14 @@ }, "Component": { "arc": 10, - "borderColor": "{{theme.colors.base4}}", - "infoForeground": "{{theme.colors.base5}}", + "borderColor": "{{theme.colors.base6}}", + "infoForeground": "{{theme.colors.base7}}", "disabledBorderColor": "{{theme.colors.base8x0c}}", "focusColor": "{{theme.colors.blue}}", "focusedBorderColor": "{{theme.colors.darkBlue}}", "focusWidth": 1, "hoverIconColor": "{{theme.colors.yellow}}", - "iconColor": "{{theme.colors.base8}}", + "iconColor": "{{theme.colors.base10}}", "errorFocusColor": "{{theme.colors.red}}", "inactiveErrorFocusColor": "{{theme.colors.errorRed}}", "warningFocusColor": "{{theme.colors.yellow}}", @@ -221,68 +221,68 @@ "background": "" }, "Variables": { - "changedValueForeground": "{{theme.colors.base5}}", - "collectingDataForeground": "{{theme.colors.base6}}", + "changedValueForeground": "{{theme.colors.base7}}", + "collectingDataForeground": "{{theme.colors.base8}}", "errorMessageForeground": "{{theme.colors.errorRed}}", - "evaluatingExpressionForeground": "{{theme.colors.base6}}", + "evaluatingExpressionForeground": "{{theme.colors.base8}}", "exceptionForeground": "{{theme.colors.errorRed}}", "modifyingValueForeground": "{{theme.colors.yellow}}", - "typeForeground": "{{theme.colors.base6}}", - "valueForeground": "{{theme.colors.base8}}" + "typeForeground": "{{theme.colors.base8}}", + "valueForeground": "{{theme.colors.base10}}" } }, "DebuggerTabs": { - "underlinedTabBackground": "{{theme.colors.base4}}" + "underlinedTabBackground": "{{theme.colors.base6}}" }, "DebuggerPopup": { - "borderColor": "{{theme.colors.base4}}" + "borderColor": "{{theme.colors.base6}}" }, "DefaultTabs": { - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base3}}", "hoverBackground": "{{theme.colors.base8x0c}}", "inactiveUnderlineColor": "{{theme.colors.yellow}}", "underlineColor": "{{theme.colors.yellow}}", - "underlinedTabBackground": "{{theme.colors.base2}}", + "underlinedTabBackground": "{{theme.colors.base3}}", "underlineHeight": 2 }, "DragAndDrop": { - "areaBackground": "{{theme.colors.base2}}", - "areaForeground": "{{theme.colors.base8}}", - "rowBackground": "{{theme.colors.base4}}", + "areaBackground": "{{theme.colors.base3}}", + "areaForeground": "{{theme.colors.base10}}", + "rowBackground": "{{theme.colors.base6}}", "borderColor": "" }, "Editor": { "background": "{{theme.colors.base1}}", - "foreground": "{{theme.colors.base7}}", - "shortcutForeground": "{{theme.colors.base5}}", + "foreground": "{{theme.colors.base9}}", + "shortcutForeground": "{{theme.colors.base7}}", "SearchField": { "background": "{{theme.colors.base1}}", "borderInsets": "" }, "Toolbar": { - "borderColor": "{{theme.colors.base3.5}}" + "borderColor": "{{theme.colors.base5}}" } }, "EditorPane": { "background": "{{theme.colors.base1}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveBackground": "{{theme.colors.base3}}", - "inactiveForeground": "{{theme.colors.base2}}", + "foreground": "{{theme.colors.base10}}", + "inactiveBackground": "{{theme.colors.base4}}", + "inactiveForeground": "{{theme.colors.base3}}", "selectionBackground": "{{theme.colors.base1}}", "selectionForeground": "{{theme.colors.yellow}}", - "splitBorder": "{{theme.colors.base5}}" + "splitBorder": "{{theme.colors.base7}}" }, "EditorTabs": { - "borderColor": "{{theme.colors.base3.5}}", + "borderColor": "{{theme.colors.base5}}", "inactiveUnderlineColor": "{{theme.colors.yellow}}", "underlineHeight": 1, "underlineColor": "{{theme.colors.yellow}}", "underlinedTabBackground": "{{theme.colors.base8x0c}}", - "underlinedTabForeground": "{{theme.colors.base7}}", + "underlinedTabForeground": "{{theme.colors.base9}}", "tabInsets": "", - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "hoverBackground": "{{theme.colors.base0}}", "inactiveColoredFileBackground": "" }, @@ -298,11 +298,11 @@ "FormattedTextField": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveBackground": "{{theme.colors.base3}}", - "inactiveForeground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "inactiveBackground": "{{theme.colors.base4}}", + "inactiveForeground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}", - "selectionBackground": "{{theme.colors.base3}}" + "selectionBackground": "{{theme.colors.base4}}" }, "GotItTooltip": { "foreground": "", @@ -312,15 +312,15 @@ "shortcutForeground": "" }, "Group": { - "disabledSeparatorColor": "{{theme.colors.base3}}", - "separatorColor": "{{theme.colors.base3.5}}" + "disabledSeparatorColor": "{{theme.colors.base4}}", + "separatorColor": "{{theme.colors.base5}}" }, "GutterTooltip": { - "infoForeground": "{{theme.colors.base9}}", + "infoForeground": "{{theme.colors.base11}}", "lineSeparatorColor": "{{theme.colors.base8x0c}}" }, "HelpTooltip": { - "borderColor": "{{theme.colors.base2}}" + "borderColor": "{{theme.colors.base3}}" }, "IconBadge": { "errorBackground": "{{theme.colors.errorRed}}", @@ -333,17 +333,17 @@ "dotY": "" }, "InformationHint": { - "borderColor": "{{theme.colors.base2}}" + "borderColor": "{{theme.colors.base3}}" }, "InplaceRefactoringPopup": { - "borderColor": "{{theme.colors.base2}}" + "borderColor": "{{theme.colors.base3}}" }, "Label": { - "background": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", - "disabledText": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base7}}", - "infoForeground": "{{theme.colors.base6}}", + "background": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", + "disabledText": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base9}}", + "infoForeground": "{{theme.colors.base8}}", "selectedForeground": "{{theme.colors.yellow}}" }, "Lesson": { @@ -358,7 +358,7 @@ "activeForeground": "{{theme.colors.yellow}}", "hoverForeground": "{{theme.colors.yellow}}", "pressedForeground": "{{theme.colors.yellow}}", - "secondaryForeground": "{{theme.colors.base6}}", + "secondaryForeground": "{{theme.colors.base8}}", "visitedForeground": "{{theme.colors.yellow}}" }, "List": { @@ -375,35 +375,35 @@ "Line": { "hoverBackground": "" }, - "background": "{{theme.colors.base1.5}}", - "foreground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base2}}", + "foreground": "{{theme.colors.base10}}", "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", - "selectionInactiveForeground": "{{theme.colors.base6}}", + "selectionInactiveForeground": "{{theme.colors.base8}}", "dropLineColor": "", "hoverBackground": "", "hoverInactiveBackground": "" }, "MainToolbar": { - "separatorColor": "{{theme.colors.base4}}" + "separatorColor": "{{theme.colors.base6}}" }, "MemoryIndicator": { "allocatedBackground": "{{theme.colors.base0}}", "usedBackground": "{{theme.colors.errorRed}}" }, "Menu": { - "foreground": "{{theme.colors.base8}}", - "background": "{{theme.colors.base2}}", - "separatorColor": "{{theme.colors.base3.5}}", + "foreground": "{{theme.colors.base10}}", + "background": "{{theme.colors.base3}}", + "separatorColor": "{{theme.colors.base5}}", "borderInsets": "", - "borderColor": "{{theme.colors.base3.5}}", - "selectionBackground": "{{theme.colors.base3.5}}", + "borderColor": "{{theme.colors.base5}}", + "selectionBackground": "{{theme.colors.base5}}", "selectionForeground": "{{theme.colors.yellow}}", - "acceleratorForeground": "{{theme.colors.base6}}", - "acceleratorSelectionForeground": "{{theme.colors.base8}}", - "disabledBackground": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", + "acceleratorForeground": "{{theme.colors.base8}}", + "acceleratorSelectionForeground": "{{theme.colors.base10}}", + "disabledBackground": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", "Selection": { "arc": 7, "innerInsets": "", @@ -411,22 +411,22 @@ } }, "MenuBar": { - "borderColor": "{{theme.colors.base3.5}}", - "disabledBackground": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "highlight": "{{theme.colors.base2}}", - "selectionBackground": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base5}}", + "disabledBackground": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "highlight": "{{theme.colors.base3}}", + "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}", "shadow": "{{theme.colors.base1}}" }, "MenuItem": { - "acceleratorForeground": "{{theme.colors.base6}}", - "background": "{{theme.colors.base2}}", - "disabledBackground": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "selectionBackground": "{{theme.colors.base3.5}}", + "acceleratorForeground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base3}}", + "disabledBackground": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "selectionBackground": "{{theme.colors.base5}}", "selectionForeground": "{{theme.colors.yellow}}" }, "NavBar": { @@ -435,8 +435,8 @@ "Notification": { "arc": 10, "background": "{{theme.colors.base8x0c}}", - "foreground": "{{theme.colors.base8}}", - "borderColor": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "borderColor": "{{theme.colors.base6}}", "borderInsets": "", "contentActionsInset": "", "errorBackground": "{{theme.colors.red}}", @@ -448,8 +448,8 @@ "foreground": "" }, "MoreButton": { - "background": "{{theme.colors.base3}}", - "foreground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", "innerBorderColor": "{{theme.colors.base8x0c}}" }, "ToolWindow": { @@ -458,10 +458,10 @@ "errorForeground": "{{theme.colors.base0}}", "informativeBackground": "{{theme.colors.base8x0c}}", "informativeBorderColor": "{{theme.colors.base8x0c}}", - "informativeForeground": "{{theme.colors.base8}}", + "informativeForeground": "{{theme.colors.base10}}", "warningBackground": "{{theme.colors.base8x0c}}", "warningBorderColor": "{{theme.colors.base8x0c}}", - "warningForeground": "{{theme.colors.base8}}" + "warningForeground": "{{theme.colors.base10}}" }, "titleActionsInset": "", "titleContentInset": "", @@ -487,9 +487,9 @@ "separatorColor": "" }, "OptionPane": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base8}}", - "messageForeground": "{{theme.colors.base8}}" + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base10}}", + "messageForeground": "{{theme.colors.base10}}" }, "PackageSearch": { "PackagesList": { @@ -515,121 +515,121 @@ } }, "Panel": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base6}}", + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base8}}", "mouseShortcutBackground": "" }, "ParameterInfo": { - "background": "{{theme.colors.base3}}", + "background": "{{theme.colors.base4}}", "borderColor": "{{theme.colors.base8x0c}}", - "currentOverloadBackground": "{{theme.colors.base3}}", + "currentOverloadBackground": "{{theme.colors.base4}}", "currentParameterForeground": "{{theme.colors.yellow}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "infoForeground": "{{theme.colors.base6}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "infoForeground": "{{theme.colors.base8}}", "lineSeparatorColor": "{{theme.colors.base8x0c}}" }, "PasswordField": { - "background": "{{theme.colors.base3}}", + "background": "{{theme.colors.base4}}", "capsLockIconColor": "{{theme.colors.yellow}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveForeground": "{{theme.colors.base4}}", - "selectionBackground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "inactiveForeground": "{{theme.colors.base6}}", + "selectionBackground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}" }, "Plugins": { - "background": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base6}}", - "eapTagBackground": "{{theme.colors.base4}}", + "background": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base8}}", + "eapTagBackground": "{{theme.colors.base6}}", "lightSelectionBackground": "{{theme.colors.base8x0c}}", "hoverBackground": "{{theme.colors.base8x0c}}", "tagForeground": "{{theme.colors.yellow}}", - "tagBackground": "{{theme.colors.base4}}", + "tagBackground": "{{theme.colors.base6}}", "Button": { "installBackground": "{{theme.colors.base1}}", "installBorderColor": "{{theme.colors.base1}}", - "installForeground": "{{theme.colors.base8}}", + "installForeground": "{{theme.colors.base10}}", "installFocusedBackground": "{{theme.colors.base1}}", - "installFillForeground": "{{theme.colors.base6}}", + "installFillForeground": "{{theme.colors.base8}}", "installFillBackground": "{{theme.colors.base1}}", "updateBackground": "{{theme.colors.base1}}", "updateBorderColor": "{{theme.colors.base1}}", - "updateForeground": "{{theme.colors.base8}}" + "updateForeground": "{{theme.colors.base10}}" }, "SearchField": { "background": "{{theme.colors.base8x0c}}" }, "SectionHeader": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base6}}" + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base8}}" }, "Tab": { "hoverBackground": "{{theme.colors.base8x0c}}", - "selectedForeground": "{{theme.colors.base8}}", + "selectedForeground": "{{theme.colors.base10}}", "selectedBackground": "{{theme.colors.base8x0c}}" } }, "Popup": { "Advertiser": { - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base3}}", "foreground": "{{theme.colors.yellow}}" }, "borderColor": "{{theme.colors.base1}}", - "inactiveBorderColor": "{{theme.colors.base2}}", - "innerBorderColor": "{{theme.colors.base2}}", + "inactiveBorderColor": "{{theme.colors.base3}}", + "innerBorderColor": "{{theme.colors.base3}}", "Header": { - "activeBackground": "{{theme.colors.base2}}", + "activeBackground": "{{theme.colors.base3}}", "inactiveBackground": "{{theme.colors.base1}}" }, "paintBorder": true, - "separatorForeground": "{{theme.colors.base8}}", - "separatorColor": "{{theme.colors.base2}}", + "separatorForeground": "{{theme.colors.base10}}", + "separatorColor": "{{theme.colors.base3}}", "Toolbar": { "background": "{{theme.colors.base1}}", "borderColor": "{{theme.colors.base8x0c}}" } }, "PopupMenu": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base8}}", - "translucentBackground": "{{theme.colors.base2}}", - "selectionBackground": "{{theme.colors.base3}}" + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base10}}", + "translucentBackground": "{{theme.colors.base3}}", + "selectionBackground": "{{theme.colors.base4}}" }, "PopupMenuSeparator": { "height": 10, "stripeIndent": 5 }, "ProgressBar": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "foreground": "{{theme.colors.yellow}}", "indeterminateEndColor": "{{theme.colors.yellow}}", - "indeterminateStartColor": "{{theme.colors.base5}}", + "indeterminateStartColor": "{{theme.colors.base7}}", "passedEndColor": "{{theme.colors.green}}", - "passedColor": "{{theme.colors.base4}}", + "passedColor": "{{theme.colors.base6}}", "warningEndColor": "{{theme.colors.darkYellow}}", - "warningColor": "{{theme.colors.base3}}", + "warningColor": "{{theme.colors.base4}}", "failedEndColor": "{{theme.colors.errorRed}}", "failedColor": "{{theme.colors.red}}", "progressColor": "{{theme.colors.blue}}", - "selectionBackground": "{{theme.colors.base4}}", - "selectionForeground": "{{theme.colors.base2}}", - "trackColor": "{{theme.colors.base4}}" + "selectionBackground": "{{theme.colors.base6}}", + "selectionForeground": "{{theme.colors.base3}}", + "trackColor": "{{theme.colors.base6}}" }, "RadioButton": { - "background": "{{theme.colors.base2}}", - "disabledText": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}" + "background": "{{theme.colors.base3}}", + "disabledText": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}" }, "RadioButtonMenuItem": { - "acceleratorForeground": "{{theme.colors.base6}}", - "acceleratorSelectionForeground": "{{theme.colors.base6}}", - "background": "{{theme.colors.base2}}", - "disabledBackground": "{{theme.colors.base2}}", - "disabledForeground": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "selectionBackground": "{{theme.colors.base3}}", + "acceleratorForeground": "{{theme.colors.base8}}", + "acceleratorSelectionForeground": "{{theme.colors.base8}}", + "background": "{{theme.colors.base3}}", + "disabledBackground": "{{theme.colors.base3}}", + "disabledForeground": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "selectionBackground": "{{theme.colors.base4}}", "selectionForeground": "{{theme.colors.yellow}}" }, "RunToolbar": { @@ -645,7 +645,7 @@ }, "RunWidget": { "background": "{{theme.colors.darkBlue}}", - "foreground": "{{theme.colors.base9}}", + "foreground": "{{theme.colors.base11}}", "hoverBackground": "{{theme.colors.base8x0c}}", "separatorColor": "{{theme.colors.blue}}", "pressedBackground": "{{theme.colors.base8x0c}}", @@ -666,12 +666,12 @@ "track": "", "trackColor": "", "Transparent": { - "trackColor": "{{theme.colors.base1.5}}", - "thumbColor": "{{theme.colors.base3.5}}", - "thumbBorderColor": "{{theme.colors.base3.5}}", + "trackColor": "{{theme.colors.base2}}", + "thumbColor": "{{theme.colors.base5}}", + "thumbBorderColor": "{{theme.colors.base5}}", "hoverTrackColor": "{{theme.colors.base1}}", - "hoverThumbColor": "{{theme.colors.base4}}", - "hoverThumbBorderColor": "{{theme.colors.base4}}" + "hoverThumbColor": "{{theme.colors.base6}}", + "hoverThumbBorderColor": "{{theme.colors.base6}}" } }, "ScrollPane": { @@ -685,23 +685,23 @@ "SearchEverywhere": { "Advertiser": { "background": "{{theme.colors.base1}}", - "foreground": "{{theme.colors.base6}}" + "foreground": "{{theme.colors.base8}}" }, "Header": { - "background": "{{theme.colors.base2}}" + "background": "{{theme.colors.base3}}" }, "List": { - "separatorColor": "{{theme.colors.base2}}", - "separatorForeground": "{{theme.colors.base6}}" + "separatorColor": "{{theme.colors.base3}}", + "separatorForeground": "{{theme.colors.base8}}" }, "SearchField": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "borderColor": "{{theme.colors.base1}}", - "infoForeground": "{{theme.colors.base6}}" + "infoForeground": "{{theme.colors.base8}}" }, "Tab": { "selectedForeground": "{{theme.colors.yellow}}", - "selectedBackground": "{{theme.colors.base4}}" + "selectedBackground": "{{theme.colors.base6}}" } }, "SearchMatch": { @@ -714,13 +714,13 @@ "selectedPressedBackground": "" }, "SegmentedButton": { - "focusedSelectedButtonColor": "{{theme.colors.base4}}", - "selectedButtonColor": "{{theme.colors.base4}}", - "selectedEndBorderColor": "{{theme.colors.base6}}", - "selectedStartBorderColor": "{{theme.colors.base6}}" + "focusedSelectedButtonColor": "{{theme.colors.base6}}", + "selectedButtonColor": "{{theme.colors.base6}}", + "selectedEndBorderColor": "{{theme.colors.base8}}", + "selectedStartBorderColor": "{{theme.colors.base8}}" }, "Separator": { - "separatorColor": "{{theme.colors.base4}}" + "separatorColor": "{{theme.colors.base6}}" }, "Settings": { "Spotlight": { @@ -734,12 +734,12 @@ "background": "{{theme.colors.base1}}" }, "Slider": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "buttonBorderColor": "{{theme.colors.orange}}", "buttonColor": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "tickColor": "{{theme.colors.base3}}", - "trackColor": "{{theme.colors.base3.5}}" + "foreground": "{{theme.colors.base10}}", + "tickColor": "{{theme.colors.base4}}", + "trackColor": "{{theme.colors.base5}}" }, "Space": { "Chat": { @@ -761,20 +761,20 @@ } }, "SpeedSearch": { - "background": "{{theme.colors.base3.5}}", - "borderColor": "{{theme.colors.base4}}", + "background": "{{theme.colors.base5}}", + "borderColor": "{{theme.colors.base6}}", "errorForeground": "{{theme.colors.red}}", - "foreground": "{{theme.colors.base9}}" + "foreground": "{{theme.colors.base11}}" }, "Spinner": { - "background": "{{theme.colors.base2}}" + "background": "{{theme.colors.base3}}" }, "SplitPane": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "highlight": "{{theme.colors.base1}}" }, "SplitPaneDivider": { - "draggingColor": "{{theme.colors.base3}}" + "draggingColor": "{{theme.colors.base4}}" }, "SshRemoteRun": { "successfulConnectionInfoLabel": "" @@ -783,11 +783,11 @@ "borderColor": "{{theme.colors.base8x0c}}" }, "TabbedPane": { - "background": "{{theme.colors.base2}}", - "foreground": "{{theme.colors.base8}}", - "contentAreaColor": "{{theme.colors.base4}}", - "disabledForeground": "{{theme.colors.base4}}", - "disabledUnderlineColor": "{{theme.colors.base4}}", + "background": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base10}}", + "contentAreaColor": "{{theme.colors.base6}}", + "disabledForeground": "{{theme.colors.base6}}", + "disabledUnderlineColor": "{{theme.colors.base6}}", "focus": "{{theme.colors.base8x0c}}", "focusColor": "{{theme.colors.base8x0c}}", "hoverColor": "{{theme.colors.base8x0c}}", @@ -801,24 +801,24 @@ "dropLineShortColor": "{{theme.colors.yellow}}", "focusCellBackground": "{{theme.colors.base1}}", "focusCellForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", + "foreground": "{{theme.colors.base10}}", "gridColor": "{{theme.colors.base1}}", "lightSelectionForeground": "{{theme.colors.yellow}}", - "lightSelectionInactiveForeground": "{{theme.colors.base8}}", + "lightSelectionInactiveForeground": "{{theme.colors.base10}}", "lightSelectionInactiveBackground": "{{theme.colors.base8x0c}}", "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base8x0c}}", - "selectionInactiveForeground": "{{theme.colors.base8}}", - "sortIconColor": "{{theme.colors.base8}}", + "selectionInactiveForeground": "{{theme.colors.base10}}", + "sortIconColor": "{{theme.colors.base10}}", "stripeColor": "{{theme.colors.base1}}" }, "TableHeader": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "bottomSeparatorColor": "{{theme.colors.base8x0c}}", "cellBorder": "4,0,4,0", - "foreground": "{{theme.colors.base8}}", - "focusCellBackground": "{{theme.colors.base3}}", + "foreground": "{{theme.colors.base10}}", + "focusCellBackground": "{{theme.colors.base4}}", "separatorColor": "{{theme.colors.base8x0c}}" }, "Tag": { @@ -827,9 +827,9 @@ "TextArea": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveForeground": "{{theme.colors.base4}}", - "selectionBackground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "inactiveForeground": "{{theme.colors.base6}}", + "selectionBackground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}" }, "TextComponent": { @@ -838,61 +838,61 @@ "TextField": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveForeground": "{{theme.colors.base4}}", - "selectionBackground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "inactiveForeground": "{{theme.colors.base6}}", + "selectionBackground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}" }, "TextPane": { "background": "{{theme.colors.base8x0c}}", "caretForeground": "{{theme.colors.yellow}}", - "foreground": "{{theme.colors.base8}}", - "inactiveForeground": "{{theme.colors.base4}}", - "selectionBackground": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base10}}", + "inactiveForeground": "{{theme.colors.base6}}", + "selectionBackground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}" }, - "textText": "{{theme.colors.base6}}", + "textText": "{{theme.colors.base8}}", "TipOfTheDay": { "Image": { - "borderColor": "{{theme.colors.base3.5}}" + "borderColor": "{{theme.colors.base5}}" } }, "TitledBorder": { - "titleColor": "{{theme.colors.base6}}" + "titleColor": "{{theme.colors.base8}}" }, "TitlePane": { "background": "{{theme.colors.base1}}", - "Button.hoverBackground": "{{theme.colors.base4}}", - "inactiveBackground": "{{theme.colors.base2}}", - "infoForeground": "{{theme.colors.base6}}", - "inactiveInfoForeground": "{{theme.colors.base6}}" + "Button.hoverBackground": "{{theme.colors.base6}}", + "inactiveBackground": "{{theme.colors.base3}}", + "infoForeground": "{{theme.colors.base8}}", + "inactiveInfoForeground": "{{theme.colors.base8}}" }, "ToggleButton": { - "borderColor": "{{theme.colors.base3}}", - "buttonColor": "{{theme.colors.base8}}", - "disabledText": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base6}}", - "offForeground": "{{theme.colors.base2}}", - "offBackground": "{{theme.colors.base2}}", + "borderColor": "{{theme.colors.base4}}", + "buttonColor": "{{theme.colors.base10}}", + "disabledText": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base8}}", + "offForeground": "{{theme.colors.base3}}", + "offBackground": "{{theme.colors.base3}}", "onBackground": "{{theme.colors.yellow}}", "onForeground": "{{theme.colors.yellow}}" }, "ToolBar": { "background": "{{theme.colors.base1}}", - "borderHandleColor": "{{theme.colors.base6}}", - "floatingForeground": "{{theme.colors.base6}}", - "foreground": "{{theme.colors.base8}}" + "borderHandleColor": "{{theme.colors.base8}}", + "floatingForeground": "{{theme.colors.base8}}", + "foreground": "{{theme.colors.base10}}" }, "ToolTip": { "Actions": { - "background": "{{theme.colors.base2}}", - "infoForeground": "{{theme.colors.base6}}" + "background": "{{theme.colors.base3}}", + "infoForeground": "{{theme.colors.base8}}" }, - "background": "{{theme.colors.base2}}", - "borderColor": "{{theme.colors.base4}}", - "foreground": "{{theme.colors.base8}}", - "infoForeground": "{{theme.colors.base6}}", - "shortcutForeground": "{{theme.colors.base6}}" + "background": "{{theme.colors.base3}}", + "borderColor": "{{theme.colors.base6}}", + "foreground": "{{theme.colors.base10}}", + "infoForeground": "{{theme.colors.base8}}", + "shortcutForeground": "{{theme.colors.base8}}" }, "ToolWindow": { "Button": { @@ -901,18 +901,18 @@ "selectedBackground": "{{theme.colors.base8x0c}}" }, "Header": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "borderColor": "{{theme.colors.base8x0c}}", - "inactiveBackground": "{{theme.colors.base2}}" + "inactiveBackground": "{{theme.colors.base3}}" }, "HeaderCloseButton": { - "background": "{{theme.colors.base2}}" + "background": "{{theme.colors.base3}}" }, "HeaderTab": { "hoverBackground": "{{theme.colors.base8x0c}}", "hoverInactiveBackground": "{{theme.colors.base8x0c}}", "inactiveUnderlineColor": "{{theme.colors.yellow}}", - "selectedInactiveBackground": "{{theme.colors.base2}}", + "selectedInactiveBackground": "{{theme.colors.base3}}", "underlineColor": "{{theme.colors.yellow}}", "underlinedTabBackground": "{{theme.colors.base8x0c}}", "underlinedTabInactiveBackground": "{{theme.colors.base8x0c}}" @@ -921,23 +921,23 @@ "Tree": { "background": "{{theme.colors.base1}}", "errorForeground": "{{theme.colors.errorRed}}", - "foreground": "{{theme.colors.base6}}", - "hash": "{{theme.colors.base4}}", + "foreground": "{{theme.colors.base8}}", + "hash": "{{theme.colors.base6}}", "hoverBackground": "{{theme.colors.base8x0c}}", - "hoverInactiveBackground": "{{theme.colors.base3}}", + "hoverInactiveBackground": "{{theme.colors.base4}}", "modifiedItemForeground": "{{theme.colors.blue}}", "rowHeight": 22, "selectionBackground": "{{theme.colors.base8x0c}}", "selectionForeground": "{{theme.colors.yellow}}", - "selectionInactiveBackground": "{{theme.colors.base3}}", + "selectionInactiveBackground": "{{theme.colors.base4}}", "paintLines": true }, "UiDesigner": { "Panel": { - "background": "{{theme.colors.base2}}" + "background": "{{theme.colors.base3}}" }, "Preview": { - "background": "{{theme.colors.base2}}" + "background": "{{theme.colors.base3}}" } }, "UnattendedHostStatus": { @@ -957,88 +957,106 @@ "VersionControl": { "FileHistory": { "Commit": { - "selectedBranchBackground": "{{theme.colors.base2}}" + "selectedBranchBackground": "{{theme.colors.base3}}" } }, "GitLog": { "headIconColor": "{{theme.colors.red}}", "localBranchIconColor": "{{theme.colors.blue}}", - "otherIconColor": "{{theme.colors.base6}}", + "otherIconColor": "{{theme.colors.base8}}", "remoteBranchIconColor": "{{theme.colors.green}}", - "tagIconColor": "{{theme.colors.base6}}" + "tagIconColor": "{{theme.colors.base8}}" }, "HgLog": { "headIconColor": "", "bookmarkIconColor": "{{theme.colors.yellow}}", "branchIconColor": "{{theme.colors.yellow}}", - "closedBranchIconColor": "{{theme.colors.base4}}", - "localTagIconColor": "{{theme.colors.base6}}", - "mqTagIconColor": "{{theme.colors.base6}}", - "tagIconColor": "{{theme.colors.base6}}", - "tipIconColor": "{{theme.colors.base6}}" + "closedBranchIconColor": "{{theme.colors.base6}}", + "localTagIconColor": "{{theme.colors.base8}}", + "mqTagIconColor": "{{theme.colors.base8}}", + "tagIconColor": "{{theme.colors.base8}}", + "tipIconColor": "{{theme.colors.base8}}" }, "Log": { "Commit": { - "currentBranchBackground": "{{theme.colors.base2}}", - "hoveredBackground": "{{theme.colors.base3.5}}", + "currentBranchBackground": "{{theme.colors.base3}}", + "hoveredBackground": "{{theme.colors.base5}}", "rowHeight": 20, - "selectionBackground": "{{theme.colors.base4}}", + "selectionBackground": "{{theme.colors.base6}}", "selectionForeground": "{{theme.colors.yellow}}", "selectionInactiveBackground": "{{theme.colors.base1}}", "selectionInactiveForeground": "{{theme.colors.yellow}}", - "unmatchedForeground": "{{theme.colors.base6}}" + "unmatchedForeground": "{{theme.colors.base8}}" } }, "MarkerPopup": { - "borderColor": "{{theme.colors.base4}}", + "borderColor": "{{theme.colors.base6}}", "borderInsets": "" }, "RefLabel": { - "backgroundBase": "{{theme.colors.base4}}", + "backgroundBase": "{{theme.colors.base6}}", "backgroundBrightness": 0, "foreground": "{{theme.colors.orange}}" } }, "Viewport": { "background": "{{theme.colors.base1}}", - "foreground": "{{theme.colors.base8}}" + "foreground": "{{theme.colors.base10}}" }, "WelcomeScreen": { - "background": "{{theme.colors.base2}}", + "background": "{{theme.colors.base3}}", "borderColor": "{{theme.colors.base8x0c}}", "captionBackground": "{{theme.colors.base1}}", - "captionForeground": "{{theme.colors.base8}}", + "captionForeground": "{{theme.colors.base10}}", "footerBackground": "{{theme.colors.base1}}", - "footerForeground": "{{theme.colors.base8}}", - "headerBackground": "{{theme.colors.base2}}", - "headerForeground": "{{theme.colors.base8}}", + "footerForeground": "{{theme.colors.base10}}", + "headerBackground": "{{theme.colors.base3}}", + "headerForeground": "{{theme.colors.base10}}", "Projects": { "background": "{{theme.colors.base1}}", - "selectionBackground": "{{theme.colors.base2}}", - "selectionInactiveBackground": "{{theme.colors.base2}}" + "selectionBackground": "{{theme.colors.base3}}", + "selectionInactiveBackground": "{{theme.colors.base3}}" }, "separatorColor": "{{theme.colors.base8x0c}}" }, - "window": "{{theme.colors.base2}}", + "window": "{{theme.colors.base3}}", "Window": { "border": "0,0,0,0,{{theme.colors.base8x0c}}" }, "windowBorder": "{{theme.colors.base8x0c}}", - "windowText": "{{theme.colors.base6}}" + "windowText": "{{theme.colors.base8}}" }, "icons": { "ColorPalette": { - "Checkbox.Background.Default.Dark": "{{theme.colors.base3}}", + "Actions.Blue": "", + "Actions.Green": "", + "Actions.Grey": "", + "Actions.GreyInline": "", + "Actions.GreyInline.Dark": "", + "Actions.Red": "", + "Actions.Yellow": "", + "Checkbox.Background.Default.Dark": "{{theme.colors.base4}}", "Checkbox.Background.Disabled.Dark": "{{theme.colors.base1}}", - "Checkbox.Background.Selected.Dark": "{{theme.colors.base3}}", - "Checkbox.Border.Default.Dark": "{{theme.colors.base5}}", - "Checkbox.Border.Disabled.Dark": "{{theme.colors.base3}}", - "Checkbox.Border.Selected.Dark": "{{theme.colors.base5}}", - "Checkbox.Focus.Thin.Default.Dark": "{{theme.colors.base3}}", + "Checkbox.Background.Selected.Dark": "{{theme.colors.base4}}", + "Checkbox.Border.Default.Dark": "{{theme.colors.base7}}", + "Checkbox.Border.Disabled.Dark": "{{theme.colors.base4}}", + "Checkbox.Border.Selected.Dark": "{{theme.colors.base7}}", + "Checkbox.Focus.Thin.Default.Dark": "{{theme.colors.base4}}", "Checkbox.Focus.Thin.Selected.Dark": "{{theme.colors.base1}}", "Checkbox.Focus.Wide.Dark": "{{theme.colors.blue}}", - "Checkbox.Foreground.Disabled.Dark": "{{theme.colors.base6}}", - "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base8}}" + "Checkbox.Foreground.Disabled.Dark": "{{theme.colors.base8}}", + "Checkbox.Foreground.Selected.Dark": "{{theme.colors.base10}}", + "Objects.BlackText": "{{theme.colors.base0}}", + "Objects.Blue": "{{theme.colors.blue}}", + "Objects.Green": "{{theme.colors.green}}", + "Objects.Grey": "{{theme.colors.base9}}", + "Objects.Pink": "", + "Objects.Purple": "{{theme.colors.purple}}", + "Objects.Red": "{{theme.colors.red}}", + "Objects.RedStatus": "{{theme.colors.errorRed}}", + "Objects.Yellow": "{{theme.colors.yellow}}", + "Objects.YellowDark": "{{theme.colors.darkYellow}}", + "Tree.iconColor": "{{theme.colors.base8}}" } } }