From 7381e2141fd5b626e66b77a571ceaf5b97675289 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 21 Apr 2020 00:10:18 +0200 Subject: [PATCH] IntelliJ Themes Demo: updated Dracula, Gruvbox and Hiberbee themes (used IJThemesUpdater) --- .../demo/intellijthemes/Dracula.theme.json | 9 +- ...bee.theme.json => HiberbeeDark.theme.json} | 140 +++++++++------ .../gruvbox_dark_hard.theme.json | 162 ++++++++++++++++++ .../gruvbox_dark_medium.theme.json | 162 ++++++++++++++++++ .../gruvbox_dark_soft.theme.json | 162 ++++++++++++++++++ .../intellijthemes/gruvbox_theme.theme.json | 127 -------------- .../flatlaf/demo/intellijthemes/themes.json | 26 ++- 7 files changed, 597 insertions(+), 191 deletions(-) rename flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/{Hiberbee.theme.json => HiberbeeDark.theme.json} (74%) create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json delete mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.theme.json diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json index d48f1c58..0f8d3a49 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Dracula.theme.json @@ -10,8 +10,7 @@ "selectionBackground": "#6272a4", "selectionInactiveBackground": "#4E5A82", "inactiveBackground": "#414450", - "borderColor": "#282a36", - "underlineColor": "#bd93f9" + "borderColor": "#282a36" }, "Borders": { "color": "#282a36", @@ -82,7 +81,7 @@ "background": "#44475a", "underlinedTabBackground": "#313341", "underlineColor": "#bd93f9", - "underlineHeight": 2 + "underlineHeight": 1 }, "FileColor": { "Blue": "#8be9fd", @@ -175,7 +174,7 @@ }, "Separator.separatorColor": "#282a35", "TabbedPane": { - "tabSelectionHeight": 2, + "tabSelectionHeight": 1, "focusColor": "#282a35", "hoverColor": "#282a35", "underlineColor": "#bd93f9", @@ -198,7 +197,7 @@ }, "HeaderTab": { "underlineColor": "#bd93f9", - "underlineHeight": 2, + "underlineHeight": 1, "underlinedTabBackground": "#313341", "underlinedTabInactiveBackground": "#313341" } diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HiberbeeDark.theme.json similarity index 74% rename from flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json rename to flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HiberbeeDark.theme.json index 79535329..3c501bcb 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/Hiberbee.theme.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/HiberbeeDark.theme.json @@ -1,10 +1,29 @@ { - "name": "Hiberbee", + "name": "Hiberbee Dark", "author": "Vlad Volkov", "dark": true, - "editorScheme": "/colors/Hiberbee.xml", + "editorScheme": "/colors/Dark.xml", "colors": { - "accent": "#FFC83C", + "black": "#000000", + "consoleBackground": "#191919", + "editorBackground": "#212121", + "panelBackground": "#333333", + "textColor": "#F9F6EF", + "border": "#3c3c3c", + "redMac": "#fb3b45", + "redWin": "#ef6950", + "redMonokaiPro": "#ff6188", + "blueWinPalette": "#409AE1", + "blue": "#78dce8", + "orangeMonokaiPro": "#fc9867", + "greenMonokaiPro": "#a9dc76", + "yellowWinPalette": "#ffc83d", + "yellowMac": "#faaa1f", + "purpleWinPalette": "#b4a0ff", + "purpleMonokaiPro": "#ab9df2", + "greenWinPalette": "#40c5af", + "greyWinPalette": "#b2b2b2", + "panelText": "#a6a6a6", "desaturatedBlue": "#1e282d", "desaturatedOrange": "#8049117f", "green": "#5B8021", @@ -20,7 +39,7 @@ "greyDot80": "#323232", "greyDot85": "#252525", "greyDot90": "#1f2021", - "lightBlue": "#57D1EB", + "lightBlue": "#70D7FF", "navyDot85": "#191d21", "navyDot90": "#1f2021", "red": "#800040", @@ -39,7 +58,7 @@ "Actions.GreyInline.Dark": "#646464", "Actions.Red": "#ff6188", "Actions.Yellow": "#FFC83C", - "Objects.BlackText": "greyDot33", + "Objects.BlackText": "#7d7d7d", "Objects.Blue": "#57D1EB", "Objects.Green": "#92D923", "Objects.GreenAndroid": "#92D923", @@ -58,7 +77,7 @@ "shadow": "greyDot75", "background": "greyDot80", "borderColor": "greyDot70", - "caretForeground": "accent", + "caretForeground": "yellowMac", "color": "greyDot50", "foreground": "greyDot20", "hoverBackground": "greyDot70", @@ -66,7 +85,7 @@ "selectedForeground": "greyDot15", "selectedInactiveBackground": "greyDot70", "selectionBackground": "navyDot85", - "selectionForeground": "accent", + "selectionForeground": "yellowMac", "separatorColor": "greyDot75", "underlineHeight": 1 }, @@ -77,7 +96,7 @@ }, "Borders": { "ContrastBorderColor": "greyDot65", - "color": "greyDot70" + "color": "border" }, "Button.default.endBackground": "greyDot80", "Button.default.endBorderColor": "greyDot65", @@ -88,38 +107,41 @@ "Button.default.startBorderColor": "greyDot65", "Button.endBackground": "greyDot80", "Button.endBorderColor": "greyDot65", - "Button.focusedBorderColor": "accent", + "Button.focusedBorderColor": "yellowMac", "Button.startBackground": "greyDot80", "Button.startBorderColor": "greyDot65", "CheckBox.disabledText": "greyDot33", "CheckBox.select": "greyDot50", "CheckBoxMenuItem.disabledBackground": "greyDot80", "ComboBox.ArrowButton.disabledIconColor": "greyDot50", - "ComboBox.ArrowButton.iconColor": "accent", + "ComboBox.ArrowButton.iconColor": "yellowMac", "ComboBox.ArrowButton.nonEditableBackground": "greyDot70", - "ComboBox.modifiedItemForeground": "accent", - "ComboBox.disabledForeground": "greyDot70", + "ComboBox.modifiedItemForeground": "yellowMac", + "ComboBox.disabledForeground": "greyDot80", "ComboBox.nonEditableBackground": "greyDot75", "ComboPopup.border": "1,1,1,1,4d4d4d", "CompletionPopup": { + "nonFocusedMask": "#34343434", + "selectionBackground": "navyDot85", "foreground": "greyDot20", - "matchForeground": "accent" + "matchForeground": "yellowMac" }, - "Component.arc": "3", - "Label.foreground": "greyDot15", - "Component.disabledBorderColor": "greyDot70", - "Component.infoForeground": "greyDot50", - "Component.errorFocusColor": "#F65F87", - "Component.focusColor": "greyDot50", - "Component.focusWidth": "0", - "Component.focusedBorderColor": "greyDot50", - "Component.hoverIconColor": "accent", - "Component.inactiveErrorFocusColor": "transparentRed", - "Component.inactiveWarningFocusColor": "transparentYellow", - "Component.warningFocusColor": "yellow", - "Debugger.Variables.changedValueForeground": "accent", + "Component": { + "arc": "3", + "disabledBorderColor": "greyDot70", + "infoForeground": "greyDot50", + "errorFocusColor": "#F65F87", + "focusColor": "greyDot50", + "focusWidth": "0", + "focusedBorderColor": "greyDot50", + "hoverIconColor": "yellowMac", + "inactiveErrorFocusColor": "transparentRed", + "inactiveWarningFocusColor": "transparentYellow", + "warningFocusColor": "yellow" + }, + "Debugger.Variables.changedValueForeground": "yellowMac", "Debugger.Variables.evaluatingExpressionForeground": "lightBlue", - "DefaultTabs.underlineColor": "accent", + "DefaultTabs.underlineColor": "yellowMac", "DefaultTabs.underlineHeight": 1, "DefaultTabs.underlinedTabBackground": "greyDot75", "DefaultTabs.underlinedTabForeground": "lightBlue", @@ -143,12 +165,17 @@ "infoForeground": "greyDot50" }, "Link.activeForeground": "lightBlue", - "Link.hoverForeground": "accent", + "Link.hoverForeground": "yellowMac", "Link.pressedForeground": "lightBlue", "Link.visitedForeground": "greyDot25", "MemoryIndicator.allocatedBackground": "green", "MemoryIndicator.usedBackground": "red", - "Menu.acceleratorForeground": "greyDot25", + "Menu": { + "separatorColor": "greyDot75", + "foreground": "textColor", + "borderColor": "greyDot70", + "acceleratorForeground": "greyDot25" + }, "Notification.MoreButton.innerBorderColor": "greyDot65", "Notification.ToolWindow.errorBackground": "greyDot85", "Notification.ToolWindow.errorBorderColor": "#ed005c", @@ -157,20 +184,25 @@ "Notification.ToolWindow.informativeBorderColor": "#92D923", "Notification.ToolWindow.informativeForeground": "#92D923", "Notification.ToolWindow.warningBackground": "greyDot85", - "Notification.ToolWindow.warningBorderColor": "accent", - "Notification.ToolWindow.warningForeground": "accent", + "Notification.ToolWindow.warningBorderColor": "yellowMac", + "Notification.ToolWindow.warningForeground": "yellowMac", "Notification.background": "greyDot85", "Notification.errorBackground": "greyDot85", "Notification.errorBorderColor": "#ed005c", "Notification.errorForeground": "#F65F87", - "OptionPane.background": "greyDot80", - "OptionPane.foreground": "greyDot33", - "Panel.background": "greyDot80", + "OptionPane": { + "background": "greyDot80", + "foreground": "greyDot20" + }, + "Panel": { + "background": "greyDot80", + "foreground": "greyDot20" + }, "Panel.foreground": "greyDot20", "ParameterInfo.background": "greyDot85", "ParameterInfo.foreground": "greyDot25", "ParameterInfo.currentOverloadBackground": "greyDot65", - "ParameterInfo.currentParameterForeground": "accent", + "ParameterInfo.currentParameterForeground": "yellowMac", "ParameterInfo.infoForeground": "greyDot33", "ParameterInfo.lineSeparatorColor": "greyDot75", "PasswordField.background": "greyDot75", @@ -178,10 +210,11 @@ "Plugins.Button.installBorderColor": "greyDot65", "Plugins.Button.installFillBackground": "greyDot80", "Plugins.Button.installFillForeground": "greyDot25", - "Plugins.Button.installForeground": "accent", + "Plugins.Button.installForeground": "yellowMac", "Plugins.SearchField.background": "greyDot75", "Plugins.SectionHeader.background": "greyDot75", - "Plugins.Tab.hoverBackground": "greyDot65", + "Plugins.Tab.hoverBackground": "navyDot85", + "Plugins.Tab.selectedBackground": "greyDot85", "Plugins.background": "greyDot80", "Plugins.disabledForeground": "greyDot50", "Plugins.lightSelectionBackground": "navyDot85", @@ -195,11 +228,11 @@ "PopupMenuSeparator.stripeWidth": 1, "ProgressBar.failedColor": "#ed005c", "ProgressBar.failedEndColor": "greyDot75", - "ProgressBar.indeterminateStartColor": "accent", + "ProgressBar.indeterminateStartColor": "yellowMac", "ProgressBar.indeterminateEndColor": "#FD971F", "ProgressBar.passedColor": "#92D923", "ProgressBar.passedEndColor": "greyDot75", - "ProgressBar.progressColor": "accent", + "ProgressBar.progressColor": "yellowMac", "ProgressBar.trackColor": "greyDot75", "RadioButton.background": "greyDot80", "RadioButtonMenuItem.disabledBackground": "greyDot80", @@ -209,32 +242,33 @@ "SearchEverywhere.SearchField.infoForeground": "greyDot33", "SearchEverywhere.SearchField.background": "greyDot75", "SearchEverywhere.Header.background": "greyDot80", - "SearchEverywhere.Tab.selectedBackground": "greyDot80", - "SearchMatch.endBackground": "accent", - "SearchMatch.startBackground": "accent", + "SearchEverywhere.Tab.selectedBackground": "greyDot85", + "SearchEverywhere.Tab.selectedForeground": "lightBlue", + "SearchMatch.endBackground": "yellowMac", + "SearchMatch.startBackground": "yellowMac", "SidePanel.background": "greyDot85", "SpeedSearch.errorForeground": "#F65F87", - "SpeedSearch.foreground": "accent", - "SplitPane.highlight": "accent", + "SpeedSearch.foreground": "yellowMac", + "SplitPane.highlight": "yellowMac", "PopupMenu.translucentBackground": "greyDot50", "TabbedPane.disabledUnderlineColor": "greyDot65", "TabbedPane.focusColor": "greyDot65", "TabbedPane.tabSelectionHeight": 1, - "TabbedPane.underlineColor": "accent", + "TabbedPane.underlineColor": "yellowMac", "Table.dropLineColor": "greyDot75", "Table.dropLineShortColor": "greyDot70", "Table.focusCellBackground": "greyDot85", - "Table.focusCellForeground": "accent", - "Table.sortIconColor": "accent", + "Table.focusCellForeground": "yellowMac", + "Table.sortIconColor": "yellowMac", "Table.stripeColor": "greyDot75", "TableHeader.background": "greyDot85", "TableHeader.bottomSeparatorColor": "greyDot65", "TextArea.background": "greyDot75", - "TextArea.caretForeground": "accent", + "TextArea.caretForeground": "yellowMac", "TextArea.inactiveBackground": "greyDot80", "TextField.background": "greyDot75", "TextField.foreground": "greyDot25", - "TextField.caretForeground": "accent", + "TextField.caretForeground": "yellowMac", "TextField.highlight": "greyDot15", "TextField.inactiveForeground": "greyDot33", "TextPane.inactiveBackground": "greyDot80", @@ -242,7 +276,7 @@ "ToggleButton.buttonColor": "greyDot65", "ToggleButton.offBackground": "greyDot75", "ToggleButton.offForeground": "greyDot25", - "ToggleButton.onBackground": "accent", + "ToggleButton.onBackground": "yellowMac", "ToggleButton.onForeground": "greyDot80", "ToolBar.borderHandleColor": "greyDot65", "ToolTip.Actions.background": "greyDot80", @@ -257,17 +291,17 @@ "ToolWindow.HeaderTab.hoverBackground": "greyDot65", "ToolWindow.HeaderTab.hoverInactiveBackground": "greyDot85", "ToolWindow.HeaderTab.inactiveUnderlineColor": "greyDot75", - "ToolWindow.HeaderTab.underlineColor": "accent", + "ToolWindow.HeaderTab.underlineColor": "yellowMac", "ToolWindow.HeaderTab.underlineHeight": 1, "ToolWindow.HeaderTab.underlinedTabBackground": "greyDot90", "ToolWindow.HeaderTab.underlinedTabInactiveBackground": "greyDot75", "Tree.background": "greyDot85", "Tree.foreground": "greyDot15", - "Tree.modifiedItemForeground": "accent", + "Tree.modifiedItemForeground": "yellowMac", "ValidationTooltip.errorBackground": "greyDot85", "ValidationTooltip.errorBorderColor": "#ed005c", "ValidationTooltip.warningBackground": "greyDot85", - "ValidationTooltip.warningBorderColor": "accent", + "ValidationTooltip.warningBorderColor": "yellowMac", "VersionControl.FileHistory.Commit.selectedBranchBackground": "greyDot70", "VersionControl.Log.Commit.currentBranchBackground": "greyDot85", "VersionControl.Log.Commit.unmatchedForeground": "greyDot25", diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json new file mode 100644 index 00000000..65c5ceec --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_hard.theme.json @@ -0,0 +1,162 @@ +{ + "name": "Gruvbox Dark Hard", + "dark": true, + "author": "Vincent Parizet", + "editorScheme": "/gruvbox_dark_hard.xml", + "colors": { + "bg0": "#282828", + "bg0_h": "#1d2021", + "bg0_s": "#32302f", + "bg1": "#3c3836", + "bg2": "#504945", + "bg3": "#665c54", + "bg4": "#7c6f64", + "bg": "#1d2021", + + "fg0": "#fbf1c7", + "fg1": "#ebdbb2", + "fg2": "#d5c4a1", + "fg3": "#bdae93", + "fg4": "#a89984", + "fg": "#ebdbb2", + + "red0": "#cc241d", + "red1": "#fb4934", + "green0": "#98971a", + "green1": "#b8bb26", + "yellow0": "#d79921", + "yellow1": "#fabd2f", + "blue0": "#458588", + "blue1": "#83a598", + "purple0": "#b16286", + "purple1": "#d3869b", + "aqua0": "#689d6a", + "aqua1": "#8ec07c", + "gray0": "#a89984", + "gray1": "#928374", + "orange0": "#d65d0e", + "orange1": "#fe8019" + }, + "ui": { + "*": { + "background": "bg", + "foreground": "fg", + + "infoForeground": "fg", + + "lightSelectionBackground": "bg1", + "selectionBackground": "#4F4945", + "selectionForeground": "fg0", + + "selectionBackgroundInactive": "bg0_s", + "selectionInactiveBackground": "bg0_s", + + "selectedBackground": "bg0_h", + "selectedForeground": "fg0", + "selectedInactiveBackground": "bg0_s", + "selectedBackgroundInactive": "bg0_s", + + "hoverBackground": "#28282866", + + "borderColor": "bg2", + "disabledBorderColor": "bg0_h", + + "separatorColor": "bg2" + }, + "ActionButton": { + "hoverBackground": "bg2" + }, + "Button": { + "startBackground": "bg", + "endBackground": "bg", + "startBorderColor": "bg2", + "endBorderColor": "bg2", + + "default": { + "foreground": "fg0", + "startBackground": "#32302F", + "endBackground": "#32302F", + "startBorderColor": "#4F4945", + "endBorderColor": "#4F4945", + "focusedBorderColor": "bg" + } + }, + "ComboBox": { + "nonEditableBackground": "bg", + "ArrowButton": { + "iconColor": "fg0", + "disabledIconColor": "fg0", + "nonEditableBackground": "bg" + } + }, + "EditorTabs": { + "selectedBackground": "bg0_s", + "underlineColor": "blue1", + "inactiveMaskColor": "#28282866" + }, + "ToolWindow": { + "Header": { + "background": "bg0_s", + "inactiveBackground": "bg" + }, + + "HeaderTab": { + "selectedInactiveBackground": "bg0_h", + "hoverInactiveBackground": "bg0_h" + } + }, + "Table": { + "stripeColor": "bg0_s", + "lightSelectionForeground": "fg0", + "lightSelectionInactiveForeground":"fg4", + "lightSelectionBackground": "bg2", + "lightSelectionInactiveBackground":"bg" + }, + "FileColor": { + "Yellow": "#fabd2f22", + "Green": "#b8bb2622", + "Blue": "#83a59822", + "Violet": "#d3869b22", + "Orange": "#fe801922", + "Rose": "#cc241d22" + }, + "Link": { + "activeForeground": "blue1", + "hoverForeground": "blue1", + "pressedForeground": "blue1", + "visitedForeground": "blue1" + } + }, + "icons": { + "ColorPalette": { + "Actions.Grey": "#928374", + "Actions.Red": "#fb4934", + "Actions.Yellow": "#fabd2f", + "Actions.Green": "#98971a", + "Actions.Blue": "#458588", + "Actions.GreyInline.Dark": "#fbf1c7", + + "Objects.Grey": "#928374FF", + "Objects.RedStatus": "#fb4934FF", + "Objects.Red": "#fb4934FF", + "Objects.Pink": "#d3869bFF", + "Objects.Yellow": "#fabd2fFF", + "Objects.Green": "#98971aFF", + "Objects.Blue": "#458588FF", + "Objects.Purple": "#b16286FF", + "Objects.BlackText": "#000000FF", + "Objects.YellowDark": "#d79921FF", + "Objects.GreenAndroid": "#b8bb26FF", + + "Checkbox.Background.Default.Dark": "#282828", + "Checkbox.Border.Default.Dark": "#fbf1c7", + "Checkbox.Foreground.Selected.Dark": "#fbf1c7", + "Checkbox.Focus.Wide.Dark": "#458588", + "Checkbox.Focus.Thin.Default.Dark": "#458588", + "Checkbox.Focus.Thin.Selected.Dark": "#458588", + "Checkbox.Background.Disabled.Dark": "#282828", + "Checkbox.Border.Disabled.Dark": "#a89984", + "Checkbox.Foreground.Disabled.Dark": "#a89984" + } + } +} diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json new file mode 100644 index 00000000..d4e0191a --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_medium.theme.json @@ -0,0 +1,162 @@ +{ + "name": "Gruvbox Dark Medium", + "dark": true, + "author": "Vincent Parizet", + "editorScheme": "/gruvbox_dark_medium.xml", + "colors": { + "bg0": "#282828", + "bg0_h": "#1d2021", + "bg0_s": "#32302f", + "bg1": "#3c3836", + "bg2": "#504945", + "bg3": "#665c54", + "bg4": "#7c6f64", + "bg": "#282828", + + "fg0": "#fbf1c7", + "fg1": "#ebdbb2", + "fg2": "#d5c4a1", + "fg3": "#bdae93", + "fg4": "#a89984", + "fg": "#ebdbb2", + + "red0": "#cc241d", + "red1": "#fb4934", + "green0": "#98971a", + "green1": "#b8bb26", + "yellow0": "#d79921", + "yellow1": "#fabd2f", + "blue0": "#458588", + "blue1": "#83a598", + "purple0": "#b16286", + "purple1": "#d3869b", + "aqua0": "#689d6a", + "aqua1": "#8ec07c", + "gray0": "#a89984", + "gray1": "#928374", + "orange0": "#d65d0e", + "orange1": "#fe8019" + }, + "ui": { + "*": { + "background": "bg", + "foreground": "fg", + + "infoForeground": "fg", + + "lightSelectionBackground": "bg1", + "selectionBackground": "#4F4945", + "selectionForeground": "fg0", + + "selectionBackgroundInactive": "bg0_s", + "selectionInactiveBackground": "bg0_s", + + "selectedBackground": "bg0_h", + "selectedForeground": "fg0", + "selectedInactiveBackground": "bg0_s", + "selectedBackgroundInactive": "bg0_s", + + "hoverBackground": "#28282866", + + "borderColor": "bg2", + "disabledBorderColor": "bg0_h", + + "separatorColor": "bg2" + }, + "ActionButton": { + "hoverBackground": "bg2" + }, + "Button": { + "startBackground": "bg", + "endBackground": "bg", + "startBorderColor": "bg2", + "endBorderColor": "bg2", + + "default": { + "foreground": "fg0", + "startBackground": "#32302F", + "endBackground": "#32302F", + "startBorderColor": "#4F4945", + "endBorderColor": "#4F4945", + "focusedBorderColor": "bg" + } + }, + "ComboBox": { + "nonEditableBackground": "bg", + "ArrowButton": { + "iconColor": "fg0", + "disabledIconColor": "fg0", + "nonEditableBackground": "bg" + } + }, + "EditorTabs": { + "selectedBackground": "bg0_s", + "underlineColor": "blue1", + "inactiveMaskColor": "#28282866" + }, + "ToolWindow": { + "Header": { + "background": "bg0_s", + "inactiveBackground": "bg" + }, + + "HeaderTab": { + "selectedInactiveBackground": "bg0_h", + "hoverInactiveBackground": "bg0_h" + } + }, + "Table": { + "stripeColor": "bg0_s", + "lightSelectionForeground": "fg0", + "lightSelectionInactiveForeground":"fg4", + "lightSelectionBackground": "bg2", + "lightSelectionInactiveBackground":"bg" + }, + "FileColor": { + "Yellow": "#fabd2f22", + "Green": "#b8bb2622", + "Blue": "#83a59822", + "Violet": "#d3869b22", + "Orange": "#fe801922", + "Rose": "#cc241d22" + }, + "Link": { + "activeForeground": "blue1", + "hoverForeground": "blue1", + "pressedForeground": "blue1", + "visitedForeground": "blue1" + } + }, + "icons": { + "ColorPalette": { + "Actions.Grey": "#928374", + "Actions.Red": "#fb4934", + "Actions.Yellow": "#fabd2f", + "Actions.Green": "#98971a", + "Actions.Blue": "#458588", + "Actions.GreyInline.Dark": "#fbf1c7", + + "Objects.Grey": "#928374FF", + "Objects.RedStatus": "#fb4934FF", + "Objects.Red": "#fb4934FF", + "Objects.Pink": "#d3869bFF", + "Objects.Yellow": "#fabd2fFF", + "Objects.Green": "#98971aFF", + "Objects.Blue": "#458588FF", + "Objects.Purple": "#b16286FF", + "Objects.BlackText": "#000000FF", + "Objects.YellowDark": "#d79921FF", + "Objects.GreenAndroid": "#b8bb26FF", + + "Checkbox.Background.Default.Dark": "#282828", + "Checkbox.Border.Default.Dark": "#fbf1c7", + "Checkbox.Foreground.Selected.Dark": "#fbf1c7", + "Checkbox.Focus.Wide.Dark": "#458588", + "Checkbox.Focus.Thin.Default.Dark": "#458588", + "Checkbox.Focus.Thin.Selected.Dark": "#458588", + "Checkbox.Background.Disabled.Dark": "#282828", + "Checkbox.Border.Disabled.Dark": "#a89984", + "Checkbox.Foreground.Disabled.Dark": "#a89984" + } + } +} diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json new file mode 100644 index 00000000..1f56814c --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_dark_soft.theme.json @@ -0,0 +1,162 @@ +{ + "name": "Gruvbox Dark Soft", + "dark": true, + "author": "Vincent Parizet", + "editorScheme": "/gruvbox_dark_soft.xml", + "colors": { + "bg0": "#282828", + "bg0_h": "#1d2021", + "bg0_s": "#32302f", + "bg1": "#3c3836", + "bg2": "#504945", + "bg3": "#665c54", + "bg4": "#7c6f64", + "bg": "#32302f", + + "fg0": "#fbf1c7", + "fg1": "#ebdbb2", + "fg2": "#d5c4a1", + "fg3": "#bdae93", + "fg4": "#a89984", + "fg": "#ebdbb2", + + "red0": "#cc241d", + "red1": "#fb4934", + "green0": "#98971a", + "green1": "#b8bb26", + "yellow0": "#d79921", + "yellow1": "#fabd2f", + "blue0": "#458588", + "blue1": "#83a598", + "purple0": "#b16286", + "purple1": "#d3869b", + "aqua0": "#689d6a", + "aqua1": "#8ec07c", + "gray0": "#a89984", + "gray1": "#928374", + "orange0": "#d65d0e", + "orange1": "#fe8019" + }, + "ui": { + "*": { + "background": "bg", + "foreground": "fg", + + "infoForeground": "fg", + + "lightSelectionBackground": "bg1", + "selectionBackground": "#4F4945", + "selectionForeground": "fg0", + + "selectionBackgroundInactive": "bg0_s", + "selectionInactiveBackground": "bg0_s", + + "selectedBackground": "bg0_h", + "selectedForeground": "fg0", + "selectedInactiveBackground": "bg0_s", + "selectedBackgroundInactive": "bg0_s", + + "hoverBackground": "#28282866", + + "borderColor": "bg2", + "disabledBorderColor": "bg0_h", + + "separatorColor": "bg2" + }, + "ActionButton": { + "hoverBackground": "bg2" + }, + "Button": { + "startBackground": "bg", + "endBackground": "bg", + "startBorderColor": "bg2", + "endBorderColor": "bg2", + + "default": { + "foreground": "fg0", + "startBackground": "#32302F", + "endBackground": "#32302F", + "startBorderColor": "#4F4945", + "endBorderColor": "#4F4945", + "focusedBorderColor": "bg" + } + }, + "ComboBox": { + "nonEditableBackground": "bg", + "ArrowButton": { + "iconColor": "fg0", + "disabledIconColor": "fg0", + "nonEditableBackground": "bg" + } + }, + "EditorTabs": { + "selectedBackground": "bg0_s", + "underlineColor": "blue1", + "inactiveMaskColor": "#28282866" + }, + "ToolWindow": { + "Header": { + "background": "bg0_s", + "inactiveBackground": "bg" + }, + + "HeaderTab": { + "selectedInactiveBackground": "bg0_h", + "hoverInactiveBackground": "bg0_h" + } + }, + "Table": { + "stripeColor": "bg0_s", + "lightSelectionForeground": "fg0", + "lightSelectionInactiveForeground":"fg4", + "lightSelectionBackground": "bg2", + "lightSelectionInactiveBackground":"bg" + }, + "FileColor": { + "Yellow": "#fabd2f22", + "Green": "#b8bb2622", + "Blue": "#83a59822", + "Violet": "#d3869b22", + "Orange": "#fe801922", + "Rose": "#cc241d22" + }, + "Link": { + "activeForeground": "blue1", + "hoverForeground": "blue1", + "pressedForeground": "blue1", + "visitedForeground": "blue1" + } + }, + "icons": { + "ColorPalette": { + "Actions.Grey": "#928374", + "Actions.Red": "#fb4934", + "Actions.Yellow": "#fabd2f", + "Actions.Green": "#98971a", + "Actions.Blue": "#458588", + "Actions.GreyInline.Dark": "#fbf1c7", + + "Objects.Grey": "#928374FF", + "Objects.RedStatus": "#fb4934FF", + "Objects.Red": "#fb4934FF", + "Objects.Pink": "#d3869bFF", + "Objects.Yellow": "#fabd2fFF", + "Objects.Green": "#98971aFF", + "Objects.Blue": "#458588FF", + "Objects.Purple": "#b16286FF", + "Objects.BlackText": "#000000FF", + "Objects.YellowDark": "#d79921FF", + "Objects.GreenAndroid": "#b8bb26FF", + + "Checkbox.Background.Default.Dark": "#282828", + "Checkbox.Border.Default.Dark": "#fbf1c7", + "Checkbox.Foreground.Selected.Dark": "#fbf1c7", + "Checkbox.Focus.Wide.Dark": "#458588", + "Checkbox.Focus.Thin.Default.Dark": "#458588", + "Checkbox.Focus.Thin.Selected.Dark": "#458588", + "Checkbox.Background.Disabled.Dark": "#282828", + "Checkbox.Border.Disabled.Dark": "#a89984", + "Checkbox.Foreground.Disabled.Dark": "#a89984" + } + } +} diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.theme.json deleted file mode 100644 index 895d59fb..00000000 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/gruvbox_theme.theme.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "name": "gruvbox-theme", - "dark": true, - "author": "Vincent Parizet", - "editorScheme": "/gruvbox_theme.xml", - "ui": { - "*": { - "background": "#282828", - "foreground": "#fbf1c7", - - "infoForeground": "#ebdbb2", - - "lightSelectionBackground": "#3c3836", - "selectionBackground": "#4F4945", - "selectionForeground": "#fbf1c7", - - "selectionBackgroundInactive": "#3c3836", - - "selectedBackground": "#1d2021", - "selectedForeground": "#fbf1c7", - "selectedInactiveBackground": "#3c3836", - "selectedBackgroundInactive": "#3c3836", - - "hoverBackground": "#28282866", - - "borderColor": "#3c3836", - "disabledBorderColor": "#1d2021", - - "separatorColor": "#3c3836" - }, - "ActionButton": { - "hoverBackground": "#504945" - }, - "Button": { - "startBackground": "#282828", - "endBackground": "#282828", - "startBorderColor": "#504945", - "endBorderColor": "#504945", - - "default": { - "foreground": "#fbf1c7", - "startBackground": "#32302F", - "endBackground": "#32302F", - "startBorderColor": "#4F4945", - "endBorderColor": "#4F4945", - "focusedBorderColor": "#282828" - } - }, - "ComboBox": { - "nonEditableBackground": "#282828", - "ArrowButton": { - "iconColor": "#fbf1c7", - "disabledIconColor": "#fbf1c7", - "nonEditableBackground": "#282828" - } - }, - "EditorTabs": { - "selectedBackground": "#3c3836", - "underlineColor": "#83a598", - "inactiveMaskColor": "#28282866" - }, - "ToolWindow": { - "Header": { - "background": "#3c3836", - "inactiveBackground": "#282828" - }, - - "HeaderTab": { - "selectedInactiveBackground": "#1d2021", - "hoverInactiveBackground": "#1d2021" - } - }, - "Table": { - "stripeColor": "#3c3836", - "lightSelectionForeground": "#fbf1c7", - "lightSelectionInactiveForeground":"#a89984", - "lightSelectionBackground": "#504945", - "lightSelectionInactiveBackground":"#282828" - }, - "FileColor": { - "Yellow": "#fabd2f22", - "Green": "#b8bb2622", - "Blue": "#83a59822", - "Violet": "#d3869b22", - "Orange": "#fe801922", - "Rose": "#cc241d22" - }, - "Link": { - "activeForeground": "#83a598", - "hoverForeground": "#83a598", - "pressedForeground": "#83a598", - "visitedForeground": "#83a598" - } - }, - "icons": { - "ColorPalette": { - "Actions.Grey": "#928374", - "Actions.Red": "#fb4934", - "Actions.Yellow": "#fabd2f", - "Actions.Green": "#98971a", - "Actions.Blue": "#458588", - "Actions.GreyInline.Dark": "#fbf1c7", - - "Objects.Grey": "#928374FF", - "Objects.RedStatus": "#fb4934FF", - "Objects.Red": "#fb4934FF", - "Objects.Pink": "#d3869bFF", - "Objects.Yellow": "#fabd2fFF", - "Objects.Green": "#98971aFF", - "Objects.Blue": "#458588FF", - "Objects.Purple": "#b16286FF", - "Objects.BlackText": "#000000FF", - "Objects.YellowDark": "#d79921FF", - "Objects.GreenAndroid": "#b8bb26FF", - - "Checkbox.Background.Default.Dark": "#282828", - "Checkbox.Border.Default.Dark": "#fbf1c7", - "Checkbox.Foreground.Selected.Dark": "#fbf1c7", - "Checkbox.Focus.Wide.Dark": "#458588", - "Checkbox.Focus.Thin.Default.Dark": "#458588", - "Checkbox.Focus.Thin.Selected.Dark": "#458588", - "Checkbox.Background.Disabled.Dark": "#282828", - "Checkbox.Border.Disabled.Dark": "#a89984", - "Checkbox.Foreground.Disabled.Dark": "#a89984" - } - } -} 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 c64a534e..ac2533fa 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 @@ -69,19 +69,33 @@ "sourceCodeUrl": "https://github.com/OlyaB/GreyTheme", "sourceCodePath": "blob/master/src/Gray.theme.json" }, - "gruvbox_theme.theme.json": { - "name": "Gruvbox", + "gruvbox_dark_hard.theme.json": { + "name": "Gruvbox Dark Hard", "license": "MIT", "licenseFile": "gruvbox_theme.LICENSE.txt", "sourceCodeUrl": "https://github.com/Vincent-P/gruvbox-intellij-theme", - "sourceCodePath": "blob/master/src/main/resources/gruvbox_theme.theme.json" + "sourceCodePath": "blob/master/src/main/resources/gruvbox_dark_hard.theme.json" }, - "Hiberbee.theme.json": { - "name": "Hiberbee", + "gruvbox_dark_medium.theme.json": { + "name": "Gruvbox Dark Medium", + "license": "MIT", + "licenseFile": "gruvbox_theme.LICENSE.txt", + "sourceCodeUrl": "https://github.com/Vincent-P/gruvbox-intellij-theme", + "sourceCodePath": "blob/master/src/main/resources/gruvbox_dark_medium.theme.json" + }, + "gruvbox_dark_soft.theme.json": { + "name": "Gruvbox Dark Soft", + "license": "MIT", + "licenseFile": "gruvbox_theme.LICENSE.txt", + "sourceCodeUrl": "https://github.com/Vincent-P/gruvbox-intellij-theme", + "sourceCodePath": "blob/master/src/main/resources/gruvbox_dark_soft.theme.json" + }, + "HiberbeeDark.theme.json": { + "name": "Hiberbee Dark", "license": "MIT", "licenseFile": "Hiberbee.LICENSE.txt", "sourceCodeUrl": "https://github.com/Hiberbee/code-highlight-themes", - "sourceCodePath": "blob/master/src/main/resources/Hiberbee.theme.json" + "sourceCodePath": "blob/master/src/main/resources/HiberbeeDark.theme.json" }, "HighContrast.theme.json": { "name": "High contrast",