From a5b69d712c3d896c5fe43742ccd010e455c6f1e6 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 26 Nov 2019 16:26:03 +0100 Subject: [PATCH] IntelliJ Themes Demo: updated themes (used IJThemesUpdater) --- .../demo/intellijthemes/Dracula.theme.json | 18 +-- .../demo/intellijthemes/Hiberbee.theme.json | 112 +++++++++--------- .../demo/intellijthemes/one_dark.theme.json | 2 + 3 files changed, 69 insertions(+), 63 deletions(-) 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 84e9da36..01664064 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 @@ -40,6 +40,10 @@ "focusedBorderColor": "#bd93f9" } }, + "Counter": { + "foreground": "#414450", + "background": "#2fc864" + }, "CheckBoxMenuItem": { "acceleratorSelectionForeground": "#ff79c6" }, @@ -78,7 +82,7 @@ "background": "#44475a", "underlinedTabBackground": "#313341", "underlineColor": "#bd93f9", - "underlineHeight": 0 + "underlineHeight": 2 }, "FileColor": { "Blue": "#8be9fd", @@ -130,12 +134,12 @@ "installBorderColor": "#bd93f9", "installForeground": "#bd93f9", "installBackground": "#414450", - "updateBorderColor": "#ff79c6", - "updateForeground": "#ff79c6", - "updateBackground": "#414450", "installFillForeground": "#414450", "installFillBackground": "#bd93f9", - "installFocusedBackground": "#414450" + "installFocusedBackground": "#414450", + "updateBorderColor": "#5da3f4", + "updateForeground": "#f8f8f2", + "updateBackground": "#5da3f4" }, "Tab": { "selectedBackground": "#282a35", @@ -190,7 +194,7 @@ }, "Separator.separatorColor": "#282a35", "TabbedPane": { - "tabSelectionHeight": 1, + "tabSelectionHeight": 2, "focusColor": "#282a35", "hoverColor": "#282a35", "underlineColor": "#bd93f9", @@ -213,7 +217,7 @@ }, "HeaderTab": { "underlineColor": "#bd93f9", - "underlineHeight": 1, + "underlineHeight": 2, "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/Hiberbee.theme.json index f8e3b98d..4ec97633 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/Hiberbee.theme.json @@ -1,6 +1,5 @@ { - "name": "Hiberbee", - "dark": true, + "author": "Vlad Volkov", "colors": { "border": "#434343", "focused": "#5a5a5a", @@ -14,14 +13,37 @@ "shadow": "#252525", "accent": "#FFC83C" }, - "author": "Vlad Volkov", + "dark": true, "editorScheme": "/Hiberbee.xml", + "icons": { + "ColorPalette": { + "Actions.Grey": "#afafaf", + "Actions.Red": "#ff0072", + "Actions.Yellow": "#f7cd46", + "Actions.Green": "#A6E22E", + "Actions.Blue": "#307bf6", + "Actions.GreyInline": "#afafaf", + "Actions.GreyInline.Dark": "#7d7d7d", + "Objects.Grey": "#c8c8c8", + "Objects.RedStatus": "#EC5F5D", + "Objects.Red": "#ff0072", + "Objects.Pink": "#ffa9ca", + "Objects.Yellow": "#f7cd46", + "Objects.Green": "#78b756", + "Objects.Purple": "#9478f6", + "Objects.BlackText": "#4b4b4b", + "Objects.Blue": "#49b0f1", + "Objects.YellowDark": "#fd971f", + "Objects.GreenAndroid": "#78c856" + } + }, + "name": "Hiberbee", "ui": { "ActionButton.hoverBackground": "separator", "ActionButton.hoverBorderColor": "focused", "ActionButton.pressedBackground": "focused", - "Borders.color": "border", "Borders.ContrastBorderColor": "separator", + "Borders.color": "border", "Button.arc": "5", "Button.background": "lightBackground", "Button.default.endBackground": "lightBackground", @@ -37,12 +59,12 @@ "Button.focusedBorderColor": "accent", "Button.foreground": "foreground", "Button.shadowColor": "shadow", + "Button.shadowWidth": "0", "Button.startBackground": "lightBackground", "Button.startBorderColor": "border", - "Button.shadowWidth": "0", "CheckBox.background": "lightBackground", - "Component.borderColor": "focused", "CheckBoxMenuItem.background": "lightBackground", + "CheckBoxMenuItem.disabledBackground": "darkBackground", "CheckBoxMenuItem.selectionForeground": "accent", "ComboBox.ArrowButton.disabledIconColor": "separator", "ComboBox.ArrowButton.iconColor": "accent", @@ -56,10 +78,11 @@ "CompletionPopup.selectionBackground": "separator", "CompletionPopup.selectionInactiveBackground": "lightBackground", "Component.arc": "5", + "Component.borderColor": "focused", "Component.errorFocusColor": "#501428", "Component.focusColor": "#595959", - "Component.focusedBorderColor": "#666666", "Component.focusWidth": "0", + "Component.focusedBorderColor": "#666666", "Component.hoverIconColor": "foreground", "Component.iconColor": "accent", "Component.inactiveErrorFocusColor": "#3c0a14", @@ -67,14 +90,15 @@ "Component.warningFocusColor": "#966432", "Counter.background": "lightBackground", "Counter.foreground": "foreground", + "Debugger.Variables.evaluatingExpressionForeground": "#6782cd", "Debugger.Variables.changedValueForeground": "#F9D778", "DebuggerPopup.borderColor": "border", "DefaultTabs.background": "lightBackground", - "DefaultTabs.hoverBackground": "separator", + "DefaultTabs.hoverBackground": "#191C21", "DefaultTabs.underlineColor": "accent", + "DefaultTabs.underlineHeight": 1, "DefaultTabs.underlinedTabBackground": "border", "DefaultTabs.underlinedTabForeground": "accent", - "DefaultTabs.underlineHeight": 1, "DragAndDrop.areaBackground": "#666666", "DragAndDrop.areaForeground": "foreground", "Editor.background": "background", @@ -84,7 +108,7 @@ "EditorPane.foreground": "foreground", "EditorPane.inactiveBackground": "paneBackground", "EditorPane.inactiveForeground": "#808080", - "EditorPane.selectionBackground": "lightBackground", + "EditorPane.selectionBackground": "#191C21", "EditorPane.selectionForeground": "accent", "EditorTabs.underlineHeight": 1, "FileColor.Blue": "#23282d", @@ -101,7 +125,7 @@ "Link.pressedForeground": "#6782cd", "Link.visitedForeground": "foreground", "List.background": "lightBackground", - "List.selectionBackground": "separator", + "List.selectionBackground": "#23262B", "List.selectionForeground": "accent", "MemoryIndicator.allocatedBackground": "#0a3c14", "MemoryIndicator.usedBackground": "#320a19", @@ -114,11 +138,6 @@ "MenuBar.selectionBackground": "focused", "MenuBar.shadow": "shadow", "MenuItem.selectionForeground": "accent", - "Notification.background": "paneBackground", - "Notification.errorBackground": "#37160b", - "Notification.errorBorderColor": "#ed6b88", - "Notification.errorForeground": "foreground", - "Notification.foreground": "foreground", "Notification.MoreButton.background": "paneBackground", "Notification.MoreButton.innerBorderColor": "separator", "Notification.ToolWindow.errorBackground": "#37160b", @@ -130,7 +149,12 @@ "Notification.ToolWindow.warningBackground": "#372c0b", "Notification.ToolWindow.warningBorderColor": "accent", "Notification.ToolWindow.warningForeground": "#e1e1e1", - "OptionPane.background": "paneBackground", + "Notification.background": "paneBackground", + "Notification.errorBackground": "#37160b", + "Notification.errorBorderColor": "#ed6b88", + "Notification.errorForeground": "foreground", + "Notification.foreground": "foreground", + "OptionPane.background": "lightBackground", "OptionPane.foreground": "foreground", "Panel.background": "lightBackground", "Panel.foreground": "foreground", @@ -140,19 +164,19 @@ "ParameterInfo.foreground": "foreground", "ParameterInfo.infoForeground": "darkerForeground", "ParameterInfo.lineSeparatorColor": "separator", - "Plugins.background": "lightBackground", "Plugins.Button.installBackground": "lightBackground", "Plugins.Button.installBorderColor": "border", "Plugins.Button.installFillBackground": "lightBackground", "Plugins.Button.installFillForeground": "foreground", "Plugins.Button.installForeground": "accent", - "Plugins.disabledForeground": "darkerForeground", - "Plugins.lightSelectionBackground": "separator", "Plugins.SearchField.background": "headerBackground", "Plugins.SectionHeader.background": "headerBackground", "Plugins.SectionHeader.foreground": "foreground", "Plugins.Tab.hoverBackground": "paneBackground", - "Plugins.Tab.selectedBackground": "lightBackground", + "Plugins.Tab.selectedBackground": "#191C21", + "Plugins.background": "lightBackground", + "Plugins.disabledForeground": "darkerForeground", + "Plugins.lightSelectionBackground": "separator", "Plugins.tagBackground": "paneBackground", "Plugins.tagForeground": "foreground", "Popup.Advertiser.background": "paneBackground", @@ -162,7 +186,7 @@ "Popup.paintBorder": false, "PopupMenu.background": "lightBackground", "PopupMenu.foreground": "foreground", - "PopupMenu.selectionBackground": "#001E2D", + "PopupMenu.selectionBackground": "#191C21", "PopupMenu.selectionForeground": "accent", "PopupMenuSeparator.stripeWidth": 1, "ProgressBar.failedColor": "#ec5f5d", @@ -175,8 +199,8 @@ "ProgressBar.trackColor": "accent", "RadioButton.background": "lightBackground", "ScrollBar.Mac.hoverTrackColor": "headerBackground", + "Slider.background": "lightBackground", "ScrollBar.Mac.trackColor": "lightBackground", - "ScrollBar.Mac.Transparent.trackColor": "focused", "ScrollPane.background": "paneBackground", "ScrollPane.foreground": "darkerForeground", "SearchEverywhere.Advertiser.background": "paneBackground", @@ -192,7 +216,6 @@ "SearchMatch.endBackground": "accent", "SearchMatch.startBackground": "accent", "Separator.separatorColor": "separator", - "SettingsTree.rowHeight": "0", "SidePanel.background": "paneBackground", "Slider.focus": "focused", "SpeedSearch.background": "lightBackground", @@ -215,7 +238,7 @@ "Table.dropLineColor": "border", "Table.dropLineShortColor": "separator", "Table.focusCellForeground": "accent", - "Table.selectionBackground": "border", + "Table.selectionBackground": "#191C21", "Table.selectionForeground": "accent", "Table.sortIconColor": "accent", "Table.stripeColor": "border", @@ -225,13 +248,13 @@ "TextArea.background": "paneBackground", "TextArea.caretForeground": "accent", "TextArea.foreground": "foreground", - "TextArea.selectionBackground": "#001E2D", + "TextArea.selectionBackground": "#191C21", "TextField.background": "headerBackground", "TextField.caretForeground": "accent", "TextField.darkShadow": "shadow", "TextField.foreground": "foreground", "TextField.highlight": "#ffffff", - "TextField.selectionBackground": "#001E2D", + "TextField.selectionBackground": "#191C21", "TextPane.background": "lightBackground", "TitlePane.background": "paneBackground", "ToggleButton.borderColor": "separator", @@ -258,15 +281,14 @@ "ToolWindow.HeaderTab.inactiveUnderlineColor": "border", "ToolWindow.HeaderTab.selectedInactiveBackground": "headerBackground", "ToolWindow.HeaderTab.underlineColor": "accent", - "ToolWindow.HeaderTab.underlinedTabInactiveBackground": "border", "ToolWindow.HeaderTab.underlineHeight": 1, + "ToolWindow.HeaderTab.underlinedTabInactiveBackground": "border", "Tree.background": "paneBackground", - "Tree.paintLines": 0, "Tree.modifiedItemForeground": "accent", - "Tree.rowHeight": "0", - "Tree.selectionBackground": "border", + "Tree.paintLines": 0, + "Tree.selectionBackground": "#191C21", "Tree.selectionForeground": "accent", - "Tree.selectionInactiveBackground": "headerBackground", + "Tree.selectionInactiveBackground": "#191C217f", "ValidationTooltip.errorBackground": "#261313", "ValidationTooltip.errorBorderColor": "#ff0072", "ValidationTooltip.warningBackground": "#372c0b", @@ -274,31 +296,9 @@ "VersionControl.FileHistory.Commit.selectedBranchBackground": "separator", "VersionControl.Log.Commit.currentBranchBackground": "#232323", "VersionControl.Log.Commit.unmatchedForeground": "foreground", - "WelcomeScreen.Projects.selectionBackground": "separator", - "WelcomeScreen.Projects.selectionInactiveBackground": "separator", + "WelcomeScreen.Projects.selectionBackground": "#191C21", + "WelcomeScreen.Projects.selectionInactiveBackground": "#191C217f", "WelcomeScreen.separatorColor": "separator", "Window.border": "1,1,1,1,4b4b4b" - }, - "icons": { - "ColorPalette": { - "Actions.Grey": "#afafaf", - "Actions.Red": "#ff0072", - "Actions.Yellow": "#f7cd46", - "Actions.Green": "#78b756", - "Actions.Blue": "#307bf6", - "Actions.GreyInline": "#afafaf", - "Actions.GreyInline.Dark": "#7d7d7d", - "Objects.Grey": "#c8c8c8", - "Objects.RedStatus": "#EC5F5D", - "Objects.Red": "#ff0072", - "Objects.Pink": "#ffa9ca", - "Objects.Yellow": "#f7cd46", - "Objects.Green": "#a6e22e", - "Objects.Purple": "#9478f6", - "Objects.BlackText": "#4b4b4b", - "Objects.Blue": "#49b0f1", - "Objects.YellowDark": "#fd971f", - "Objects.GreenAndroid": "#78b756" - } } } diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json index c3a1b7c9..2d511479 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/one_dark.theme.json @@ -67,6 +67,7 @@ "ComboBox": { "nonEditableBackground": "#333841", "background": "#333841", + "selectionBackground": "#4d78cc", "ArrowButton": { "iconColor": "#abb2bf", "disabledIconColor": "#2c313a", @@ -324,6 +325,7 @@ }, "Tree": { + "selectionBackground": "#4d78cc", "modifiedItemForeground": "#568AF2", "rowHeight": 20 },