diff --git a/CHANGELOG.md b/CHANGELOG.md index f8e57582..60e0aa78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ FlatLaf Change Log - Support embedding UI defaults inspector panel into any window. See `FlatUIDefaultsInspector.createInspectorPanel()`. - Copy selected keys and values into clipboard via context menu. +- IntelliJ Themes: + - Updated "Dracula" and "Gradianto" themes. #### Fixed bugs diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json index 39cf75cb..a1f0fd19 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json @@ -74,7 +74,7 @@ "license": "MIT", "licenseFile": "Dracula.LICENSE.txt", "sourceCodeUrl": "https://github.com/dracula/jetbrains", - "sourceCodePath": "blob/master/src/main/resources/themes/dracula.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json" }, "Gradianto_dark_fuchsia.theme.json": { "name": "Gradianto Dark Fuchsia", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json index 0f0fd1e2..95d57fb9 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Dracula.theme.json @@ -2,37 +2,48 @@ "name": "Dracula", "dark": true, "author": "Zihan Ma", - "editorScheme": "/themes/dracula.xml", + "editorScheme": "/themes/Dracula.xml", + "colors": { + "primaryForeground": "#f8f8f2", + "primaryBackground": "#414450", + "secondaryBackground": "#44475a", + "hoverBackground": "#282a36", + "selectionBackground": "#6272a4", + "selectionInactiveBackground": "#4e5a82", + "borderColor": "#282a36", + "separatorColor": "#282a36" + }, "ui": { "*": { "arc": "7", - "background": "#414450", - "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4e5a82", - "inactiveBackground": "#414450", - "borderColor": "#282a36" + "background": "primaryBackground", + "selectionBackground": "selectionBackground", + "selectionInactiveBackground": "selectionInactiveBackground", + "inactiveBackground": "primaryBackground", + "borderColor": "borderColor", + "separatorColor": "separatorColor" }, "Borders": { - "color": "#282a36", - "ContrastBorderColor": "#282a36" + "color": "borderColor", + "ContrastBorderColor": "borderColor" }, "ActionButton": { - "hoverBackground": "#282a35", - "hoverBorderColor": "#282a35", - "pressedBackground": "#282a35", - "pressedBorderColor": "#282a35" + "hoverBackground": "hoverBackground", + "hoverBorderColor": "hoverBackground", + "pressedBackground": "hoverBackground", + "pressedBorderColor": "hoverBackground" }, "Button": { - "foreground": "#f8f8f2", - "startBorderColor": "#6272a4", - "endBorderColor": "#6272a4", - "startBackground": "#6272a4", - "endBackground": "#6272a4", + "foreground": "primaryForeground", + "startBorderColor": "selectionBackground", + "endBorderColor": "selectionBackground", + "startBackground": "selectionBackground", + "endBackground": "selectionBackground", "focusedBorderColor": "#bd93f9", "default": { - "foreground": "#f8f8f2", - "startBackground": "#6272a4", - "endBackground": "#6272a4", + "foreground": "primaryForeground", + "startBackground": "selectionBackground", + "endBackground": "selectionBackground", "startBorderColor": "#bd93f9", "endBorderColor": "#bd93f9", "focusColor": "#bd93f9", @@ -40,7 +51,7 @@ } }, "Counter": { - "foreground": "#414450", + "foreground": "primaryBackground", "background": "#2fc864" }, "CheckBoxMenuItem": { @@ -49,50 +60,50 @@ "ComboBox": { "modifiedItemForeground": "#ff79c6", "ArrowButton": { - "background": "#44475a", - "nonEditableBackground": "#44475a", + "background": "secondaryBackground", + "nonEditableBackground": "secondaryBackground", "iconColor": "#bd93f9" }, "selectionBackground": "#bd93f9", - "nonEditableBackground": "#44475a" + "nonEditableBackground": "secondaryBackground" }, "CompletionPopup": { - "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4e5a82", + "selectionBackground": "selectionBackground", + "selectionInactiveBackground": "selectionInactiveBackground", "matchForeground": "#ff79c6" }, "Component": { "focusColor": "#bd93f9", - "borderColor": "#6272a4", - "focusedBorderColor": "#6272a4", + "borderColor": "selectionBackground", + "focusedBorderColor": "selectionBackground", "errorFocusColor": "#ff5554", "inactiveErrorFocusColor": "#ff5554", "warningFocusColor": "#f1fa8c", "inactiveWarningFocusColor": "#f1fa8c" }, "DragAndDrop": { - "areaBorderColor": "#6272a4" + "areaBorderColor": "selectionBackground" }, "Editor": { - "background": "#44475a", + "background": "secondaryBackground", "shortcutForeground": "#ff79c6" }, "EditorTabs": { - "background": "#44475a", + "background": "secondaryBackground", "underlinedTabBackground": "#313341", "underlineColor": "#bd93f9", - "underlineHeight": 1 + "underlineHeight": 2 }, "FileColor": { "Blue": "#8be9fd", "Green": "#63667E", "Orange": "#ffb86c", - "Yellow": "#44475a", + "Yellow": "secondaryBackground", "Rose": "#ff79c6", "Violet": "#bd93f9" }, "Label": { - "foreground": "#f8f8f2", + "foreground": "primaryForeground", "errorForeground": "#ff5554" }, "Link": { @@ -102,51 +113,52 @@ "pressedForeground": "#bd93f9" }, "Notification": { - "borderColor": "#6272a4", + "borderColor": "selectionBackground", "errorBorderColor": "#ff5554", - "errorBackground": "#414450", - "errorForeground": "#f8f8f2", + "errorBackground": "primaryBackground", + "errorForeground": "primaryForeground", "ToolWindow": { - "warningForeground": "#f8f8f2", - "warningBackground": "#414450", + "warningForeground": "primaryForeground", + "warningBackground": "primaryBackground", "warningBorderColor": "#ffb86c", - "errorForeground": "#f8f8f2", + "errorForeground": "primaryForeground", "errorBorderColor": "#ff5554", - "errorBackground": "#414450", - "informativeForeground": "#f8f8f2", - "informativeBackground": "#414450", + "errorBackground": "primaryBackground", + "informativeForeground": "primaryForeground", + "informativeBackground": "primaryBackground", "informativeBorderColor": "#50fa7b" } }, "Plugins": { "SearchField": { - "background": "#44475a" + "background": "secondaryBackground" }, "SectionHeader": { - "foreground": "#f8f8f2" + "foreground": "primaryForeground" }, - "lightSelectionBackground": "#282a35", + "hoverBackground": "hoverBackground", + "lightSelectionBackground": "hoverBackground", "Button": { "installBorderColor": "#bd93f9", "installForeground": "#bd93f9", - "installBackground": "#414450", - "installFillForeground": "#414450", + "installBackground": "primaryBackground", + "installFillForeground": "primaryBackground", "installFillBackground": "#bd93f9", - "installFocusedBackground": "#414450", + "installFocusedBackground": "primaryBackground", "updateBorderColor": "#5da3f4", - "updateForeground": "#f8f8f2", + "updateForeground": "primaryForeground", "updateBackground": "#5da3f4" }, "Tab": { - "selectedBackground": "#282a35", - "selectedForeground": "#f8f8f2", - "hoverBackground": "#282a35" + "selectedBackground": "hoverBackground", + "selectedForeground": "primaryForeground", + "hoverBackground": "hoverBackground" } }, "ProgressBar": { "failedColor": "#ff5554", "failedEndColor": "#ff5554", - "trackColor": "#6272a4", + "trackColor": "selectionBackground", "progressColor": "#ff79c6", "indeterminateStartColor": "#93b8f9", "indeterminateEndColor": "#bd93f9", @@ -155,8 +167,8 @@ }, "Popup": { "Header": { - "activeBackground": "#44475a", - "inactiveBackground": "#44475a" + "activeBackground": "secondaryBackground", + "inactiveBackground": "secondaryBackground" } }, "ScrollBar": { @@ -169,39 +181,54 @@ }, "SearchEverywhere": { "SearchField": { - "background": "#44475a" + "background": "secondaryBackground" }, "Tab": { "selectedBackground": "#313341", - "selectedForeground": "#f8f8f2" + "selectedForeground": "primaryForeground" } }, "SearchMatch": { "startBackground": "#ff79c6", "endBackground": "#ff79c6" }, - "Separator.separatorColor": "#282a35", + "Separator": { + "separatorColor": "separatorColor" + }, + "SidePanel": { + "background": "secondaryBackground" + }, + "StatusBar": { + "hoverBackground": "hoverBackground" + }, "TabbedPane": { "tabSelectionHeight": 1, - "focusColor": "#282a35", - "hoverColor": "#282a35", + "focusColor": "hoverBackground", + "hoverColor": "hoverBackground", "underlineColor": "#bd93f9", - "contentAreaColor": "#282a35" + "contentAreaColor": "hoverBackground" + }, + "Table": { + "gridColor": "#5d617a", + "hoverBackground": "selectionBackground" + }, + "TableHeader": { + "bottomSeparatorColor": "separatorColor" }, "ToggleButton": { "onBackground": "#50fa7b", - "onForeground": "#282a35", - "offBackground": "#6272a4", - "offForeground": "#282a35", - "buttonColor": "#f8f8f2" + "onForeground": "hoverBackground", + "offBackground": "selectionBackground", + "offForeground": "hoverBackground", + "buttonColor": "primaryForeground" }, "ToolWindow": { "Button": { - "hoverBackground": "#282a35" + "hoverBackground": "hoverBackground" }, "Header": { - "background": "#44475a", - "inactiveBackground": "#44475a" + "background": "secondaryBackground", + "inactiveBackground": "secondaryBackground" }, "HeaderTab": { "underlineColor": "#bd93f9", @@ -212,8 +239,8 @@ }, "Tree": { "modifiedItemForeground": "#ff79c6", - "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4e5a82" + "selectionBackground": "selectionBackground", + "selectionInactiveBackground": "selectionInactiveBackground" }, "ValidationTooltip": { "errorBackground": "#ff5554", @@ -224,7 +251,7 @@ "VersionControl": { "FileHistory": { "Commit": { - "selectedBranchBackground": "#44475a" + "selectedBranchBackground": "secondaryBackground" } }, "GitLog": { @@ -236,16 +263,23 @@ }, "Log": { "Commit": { - "currentBranchBackground": "#44475a" + "hoveredBackground": "selectionBackground", + "currentBranchBackground": "secondaryBackground" } } }, "WelcomeScreen": { - "separatorColor": "#191b1f", + "SidePanel": { + "background": "secondaryBackground" + }, + "separatorColor": "separatorColor", "Projects": { - "background": "#282a35", - "selectionBackground": "#44475a", - "selectionInactiveBackground": "#44475a" + "background": "hoverBackground", + "selectionBackground": "secondaryBackground", + "selectionInactiveBackground": "secondaryBackground", + "actions": { + "background": "hoverBackground" + } } } }, diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json index ac5c3eb7..b2d43faa 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json @@ -230,35 +230,35 @@ "ScrollBar" : { "hoverThumbBorderColor" : "#39666394", "background" : "#16322cff", - "hoverThumbColor": "#1f3e38b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#224039ff", - "thumb": "#20403aff", + "thumb": "#406480ff", "thumbBorderColor": "#39666394", - "thumbColor": "#20403d94", + "thumbColor": "#406480ff", "thumbDarkShadow": "#122623ff", "thumbHighlight": "#2a4f4cff", "thumbShadow": "#162b24ff", "track": "#182d26ff", "Transparent": { - "thumbColor": "#20403d94", + "thumbColor": "#406480ff", "hoverThumbBorderColor" : "#14262694", - "hoverThumbColor": "#1f3e38b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#224039ff", "thumbBorderColor": "#14262694" }, "Mac" : { "Transparent": { - "thumbColor": "#20403d94", + "thumbColor": "#406480ff", "hoverThumbBorderColor" : "#14262694", - "hoverThumbColor": "#1f3e38b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#224039ff", - "thumbBorderColor": "##39666394" + "thumbBorderColor": "#39666394" }, "hoverThumbBorderColor" : "#14262694", - "hoverThumbColor": "#1f3e38b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#224039ff", "thumbBorderColor": "#14262694", - "thumbColor": "#20403d94" + "thumbColor": "#406480ff" } }, "EditorPane.inactiveBackground": "#254a39ff" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json index dd5058f1..c27af9ea 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json @@ -252,35 +252,35 @@ "ScrollBar" : { "hoverThumbBorderColor" : "#3a2241b2", "background" : "#241632ff", - "hoverThumbColor": "#472950b2", + "hoverThumbColor": "#694f92ff", "hoverTrackColor": "#3d2240ff", "thumb": "#2f2040ff", "thumbBorderColor": "#2c152fff", - "thumbColor": "#2f1f4094", + "thumbColor": "#6c499194", "thumbDarkShadow": "#261226ff", "thumbHighlight": "#4f2a4eff", "thumbShadow": "#22162bff", "track": "#23182dff", "Transparent": { - "thumbColor": "#2f1f4094", + "thumbColor": "#6c499194", "hoverThumbBorderColor" : "#3a2241b2", - "hoverThumbColor": "#472950b2", + "hoverThumbColor": "#694f92ff", "hoverTrackColor": "#3d2240ff", "thumbBorderColor": "#2c152fff" }, "Mac" : { "Transparent": { - "thumbColor": "#2f1f4094", + "thumbColor": "#6c499194", "hoverThumbBorderColor" : "#3a2241b2", - "hoverThumbColor": "#472950b2", + "hoverThumbColor": "#694f92ff", "hoverTrackColor": "#3d2240ff", "thumbBorderColor": "#2c152fff" }, "hoverThumbBorderColor" : "#3a2241b2", - "hoverThumbColor": "#472950b2", + "hoverThumbColor": "#694f92ff", "hoverTrackColor": "#3d2240ff", "thumbBorderColor": "#2c152fff", - "thumbColor": "#2f1f4094" + "thumbColor": "#6c499194" } }, "TabbedPane": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json index b518a1e7..6cf44d12 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json @@ -18,7 +18,6 @@ "disabledForeground": "#a3a3a3", "disabledBackground": "#222f44", "inactiveBackground": "#325180", - "errorForeground": "#b5b5b5", "disabledText": "#adadad", @@ -71,35 +70,35 @@ "ScrollBar" : { "hoverThumbBorderColor" : "#12182994", "background" : "#161f3294", - "hoverThumbColor": "#313f62b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#222a40b2", - "thumb": "#20294094", + "thumb": "#3c557cff", "thumbBorderColor": "#12182994", - "thumbColor": "#20294094", + "thumbColor": "#3c557cff", "thumbDarkShadow": "#0c0f1a94", "thumbHighlight": "#3b496bb2", "thumbShadow": "#161a2b94", "track": "#181e2db2", "Transparent": { - "thumbColor": "#20294094", + "thumbColor": "#3c557cff", "hoverThumbBorderColor" : "#12182994", - "hoverThumbColor": "#313f62b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#222a40b2", "thumbBorderColor": "#12182994" }, "Mac" : { "Transparent": { - "thumbColor": "#20294094", + "thumbColor": "#3c557cff", "hoverThumbBorderColor" : "#12182994", - "hoverThumbColor": "#313f62b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#222a40b2", "thumbBorderColor": "#12182994" }, "hoverThumbBorderColor" : "#12182994", - "hoverThumbColor": "#313f62b2", + "hoverThumbColor": "#497486ff", "hoverTrackColor": "#222a40b2", "thumbBorderColor": "#12182994", - "thumbColor": "#20294094" + "thumbColor": "#3c557cff" } }, diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json index 912a3448..379efced 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/one_dark.theme.json @@ -341,6 +341,7 @@ "VersionControl": { "Log.Commit": { "currentBranchBackground": "#282c35", + "hoveredBackground": "#2c313c", "unmatchedForeground": "#5c6370" },