From 7a9bdf9be05545d6002ae0b25c13f39fa94bb19c Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 2 Aug 2023 15:03:57 +0200 Subject: [PATCH] IntelliJ Themes: updated themes to newest versions (used IJThemesUpdater) --- CHANGELOG.md | 6 +- .../com/formdev/flatlaf/IntelliJTheme.java | 3 +- .../demo/intellijthemes/IJThemesPanel.java | 5 +- .../flatlaf/demo/intellijthemes/themes.json | 2 +- .../intellijthemes/themes/Dracula.theme.json | 37 +- .../themes/Gradianto_Nature_Green.theme.json | 32 +- .../themes/Gradianto_dark_fuchsia.theme.json | 36 +- .../themes/Gradianto_deep_ocean.theme.json | 30 +- .../themes/Gradianto_midnight_blue.theme.json | 60 +++- .../themes/HiberbeeDark.theme.json | 332 ++++++++++-------- .../intellijthemes/themes/nord.theme.json | 2 +- .../intellijthemes/themes/one_dark.theme.json | 4 +- 12 files changed, 347 insertions(+), 202 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1061bbd7..e5b4bcd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,10 @@ FlatLaf Change Log scrollable. - Added system property `flatlaf.useNativeLibrary` to allow disabling loading of FlatLaf native library. (issue #674) -- IntelliJ Themes: Reduced memory footprint and improved setup speed by ignoring - IntelliJ UI properties that are not used in FlatLaf. +- IntelliJ Themes: + - Reduced memory footprint by releasing Json data and ignoring IntelliJ UI + properties that are not used in FlatLaf. + - Updated "Hiberbee Dark" and "Gradianto" themes. #### Fixed bugs diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index 4530b014..be8e004e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -502,8 +502,6 @@ public class IntelliJTheme if( !key.startsWith( "Checkbox." ) || !(value instanceof String) ) continue; - String key2 = checkboxDuplicateColors.get( key ); - if( dark ) key = StringUtils.removeTrailing( key, ".Dark" ); @@ -517,6 +515,7 @@ public class IntelliJTheme if( color != null ) { defaults.put( newKey, color ); + String key2 = checkboxDuplicateColors.get( key + ".Dark"); if( key2 != null ) { // When IDEA replaces colors in SVGs it uses color values and not the keys // from com.intellij.ide.ui.UITheme.colorPalette, but there are some keys that diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java index 2e897286..4e6cf41f 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java @@ -370,7 +370,10 @@ public class IJThemesPanel if( themeInfo == null || themeInfo.resourceName == null ) return; - String themeUrl = (themeInfo.sourceCodeUrl + '/' + themeInfo.sourceCodePath).replace( " ", "%20" ); + String themeUrl = themeInfo.sourceCodeUrl; + if( themeInfo.sourceCodePath != null ) + themeUrl += '/' + themeInfo.sourceCodePath; + themeUrl = themeUrl.replace( " ", "%20" ); try { Desktop.getDesktop().browse( new URI( themeUrl ) ); } catch( IOException | URISyntaxException ex ) { 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 4e6cb984..6513b90a 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 @@ -145,7 +145,7 @@ "license": "MIT", "licenseFile": "Hiberbee.LICENSE.txt", "sourceCodeUrl": "https://github.com/Hiberbee/themes", - "sourceCodePath": "blob/latest/src/main/resources/themes/HiberbeeDark.theme.json" + "sourceCodePath": "blob/latest/src/intellij/src/main/resources/themes/HiberbeeDark.theme.json" }, "HighContrast.theme.json": { "name": "High contrast", 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 9d9bde87..ba77bfcf 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 @@ -41,23 +41,17 @@ "Bookmark": { "iconBackground": "accentColor", "Mnemonic": { - "iconForeground": "primaryForeground", - "iconBackground": "#8d6b81", - "iconBorderColor": "accentColor" + "iconForeground": "primaryForeground" + }, + "MnemonicAssigned": { + "foreground": "primaryForeground", + "background": "#786299" + }, + "MnemonicCurrent": { + "foreground": "primaryForeground", + "background": "#8d6b81" } }, - "BookmarkMnemonicAssigned": { - "buttonForeground": "primaryForeground", - "buttonBackground": "#786299", - "borderColor": "secondaryAccentColor" - }, - "BookmarkMnemonicAvailable": { - }, - "BookmarkMnemonicCurrent": { - "buttonForeground": "primaryForeground", - "buttonBackground": "#8d6b81", - "borderColor": "accentColor" - }, "Button": { "foreground": "primaryForeground", "startBorderColor": "selectionBackground", @@ -156,6 +150,15 @@ "informativeBorderColor": "#50fa7b" } }, + "NotificationsToolwindow": { + "newNotification": { + "hoverBackground": "secondaryBackground", + "background": "secondaryBackground" + }, + "Notification": { + "hoverBackground": "secondaryBackground" + } + }, "PasswordField": { "background": "secondaryBackground" }, @@ -255,6 +258,7 @@ }, "ToolWindow": { "Button": { + "selectedBackground": "secondaryAccentColor", "hoverBackground": "hoverBackground" }, "Header": { @@ -271,7 +275,8 @@ "Tree": { "modifiedItemForeground": "accentColor", "selectionBackground": "selectionBackground", - "selectionInactiveBackground": "selectionInactiveBackground" + "selectionInactiveBackground": "selectionInactiveBackground", + "hash": "hoverBackground" }, "ValidationTooltip": { "errorBackground": "#4c273c", 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 b2d43faa..c245a7a9 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 @@ -45,8 +45,10 @@ "separatorColor": "#20574f" }, "Tree": { - "background": "#203a40", - "selectionBackground": "#00695c" + "background": "#20403f", + "selectionBackground": "#00695c", + "hoverBackground": "#386d54f8", + "hoverInactiveBackground": "#386d54f8" }, "ActionButton": { "hoverBackground": "#084934", @@ -103,6 +105,13 @@ "Editor": { "shortcutForeground": "#3f795b" }, + "MemoryIndicator": { + "usedBackground": "#386d54f8", + "allocatedBackground": "#2f5e47e8" + }, + "NotificationsToolwindow.newNotification.background": "#2f5e47e8", + "NotificationsToolwindow.newNotification.hoverBackground": "#386d54f8", + "NotificationsToolwindow.Notification.hoverBackground": "#386d54f8", "EditorTabs": { "selectedForeground": "#eceff1", "selectedBackground": "#006448", @@ -215,17 +224,28 @@ }, "DragAndDrop": { "areaForeground": "#e5e5e5", - "areaBackground": "#243937", + "areaBackground": "#2439378a", "areaBorderColor": "#143427" }, "Plugins": { "SectionHeader.background": "#2a6346", "tagBackground": "#3d5a50", - "lightSelectionBackground": "#3c7e64" + "lightSelectionBackground": "#356f58", + "hoverBackground": "#325e4d" }, + "VersionControl": { - "Log.Commit.currentBranchBackground": "#225740", - "Log.Commit.unmatchedForeground": "#94aba8" + "Log.Commit.currentBranchBackground": "#1e3938", + "Log.Commit.unmatchedForeground": "#94aba8", + "GitLog.localBranchIconColor": "#65a05c", + "GitLog.tagIconColor": "#bcc4ce", + "Log.Commit.hoveredBackground": "#34634dff", + "Log.Commit.rowHeight": 30, + "Log.Commit.selectionBackground": "#00695c", + "Log.Commit.selectionInactiveBackground": "#004b41", + "RefLabel.backgroundBase": "#04d9ffff", + "RefLabel.backgroundBrightness": 0.99 + }, "ScrollBar" : { "hoverThumbBorderColor" : "#39666394", 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 c27af9ea..ad651e73 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 @@ -30,10 +30,29 @@ "separatorColor": "#4b2665" }, + "Tree": { + "hoverBackground": "#71468f", + "hoverInactiveBackground": "#71468f" + }, + "MemoryIndicator": { + "usedBackground": "#6f3986", + "allocatedBackground": "#4a2b5e" + }, + "NotificationsToolwindow.newNotification.background": "#4a2b5e", + "NotificationsToolwindow.newNotification.hoverBackground": "#6f3986", + "NotificationsToolwindow.Notification.hoverBackground": "#6f3986", "VersionControl" :{ - "Log.Commit.currentBranchBackground": "#442661", - "Log.Commit.unmatchedForeground": "#8f7fa8" + "Log.Commit.currentBranchBackground": "#2e1e38", + "Log.Commit.unmatchedForeground": "#8f7fa8", + "GitLog.localBranchIconColor": "#65a05c", + "GitLog.tagIconColor": "#bcc4ce", + "Log.Commit.hoveredBackground": "#512663", + "Log.Commit.rowHeight": 30, + "Log.Commit.selectionBackground": "#402a4b", + "Log.Commit.selectionInactiveBackground": "#402a4b", + "RefLabel.backgroundBase": "#04d9ffff", + "RefLabel.backgroundBrightness": 0.99 }, "ActionButton": { "hoverBackground": "#512663", @@ -71,9 +90,9 @@ "RadioButton": { "foreground": "#c8ccd0" }, - "CompletionPopup": { - "matchForeground": "#652683", + + "matchForeground": "#cf98db", "matchSelectionForeground": "#9057f2" }, @@ -123,7 +142,7 @@ "selectedBackground": "#8a599e", "underlinedTabBackground": "#5c306f", "background": "#3e1c4c", - "underlineColor": "#693d6c", + "underlineColor": "#8b5c8e", "hoverMaskColor": "#71468f", "inactiveMaskColor": "#34244aff" }, @@ -239,12 +258,13 @@ }, "DragAndDrop": { "areaForeground": "#FFFFFF", - "areaBackground": "#745382", + "areaBackground": "#7453829a", "areaBorderColor": "#392d42" }, "Plugins": { "SectionHeader.background": "#7b638b", "tagBackground": "#7d6089", + "hoverBackground": "#7a5a89", "lightSelectionBackground": "#4e3a57", "Tab.selectedBackground": "#a778bfff", "Tab.hoverBackground": "#82519cff" @@ -295,7 +315,9 @@ "Checkbox.Background.Default.Dark": "#442557", "Checkbox.Border.Default.Dark": "#532d68", "Checkbox.Foreground.Selected.Dark": "#6aae41", - + "Checkbox.Background.Default": "#532e6a", + "Checkbox.Background.Disabled": "#321d3d", + "Checkbox.Background.Disabled.Dark": "#321d3d", "Objects.Grey": "#a098a0", "Objects.Blue": "#55a9c2", "Objects.RedStatus": "#a74d4dff", 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 6cf44d12..b6a234c8 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 @@ -30,9 +30,30 @@ "separatorColor": "#1d304b" }, "Tree.background": "#24334a", + "Tree": { + "hoverInactiveBackground": "#324565", + + "hoverBackground": "#324565" + }, + "NotificationsToolwindow.newNotification.background" : "#314465", + "NotificationsToolwindow.newNotification.hoverBackground" : "#3c557cff", + "NotificationsToolwindow.Notification.hoverBackground" : "#3c557cff", + "MemoryIndicator": { + "usedBackground": "#324565", + "allocatedBackground": "#25334b" + }, + "VersionControl" :{ - "Log.Commit.currentBranchBackground": "#263d61", - "Log.Commit.unmatchedForeground": "#7f8aa8" + "Log.Commit.currentBranchBackground": "#1b2638", + "Log.Commit.unmatchedForeground": "#9ea8c2", + "Log.Commit.hoveredBackground": "#324565", + "Log.Commit.rowHeight": 30, + "Log.Commit.selectionInactiveBackground": "#283752", + "Log.Commit.selectionBackground": "#384d6f", + "GitLog.tagIconColor": "#bcc4ce", + "GitLog.localBranchIconColor": "#65a05c", + "RefLabel.backgroundBrightness": 0.99, + "RefLabel.backgroundBase": "#04d9ffff" }, "ActionButton": { "hoverBackground": "#324565", @@ -141,7 +162,7 @@ "selectedBackground": "#324d65", "underlinedTabBackground": "#324d65", "background": "#243647", - "underlineColor": "#46628f", + "underlineColor": "#4d6690", "hoverMaskColor": "#46628f", "inactiveMaskColor": "#24334aff" }, @@ -247,12 +268,13 @@ }, "DragAndDrop": { "areaForeground": "#e5e5e5", - "areaBackground": "#242b39", + "areaBackground": "#242b394a", "areaBorderColor": "#141834" }, "Plugins": { "SectionHeader.background": "#2a3563", "tagBackground": "#3d445a", + "hoverBackground": "#495787", "lightSelectionBackground": "#3c4b7e" }, "EditorPane.inactiveBackground": "#25334aff" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json index 70f7274d..37dc8ed6 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json @@ -30,9 +30,29 @@ "separatorColor": "#383850" }, + "Tree": { + "hoverBackground": "#5841a7", + "hoverInactiveBackground": "#5841a7" + + }, + "MemoryIndicator": { + "usedBackground": "#504480", + "allocatedBackground": "#493c6c" + }, + "NotificationsToolwindow.newNotification.background": "#504480", + "NotificationsToolwindow.newNotification.hoverBackground": "#493c6c", + "NotificationsToolwindow.Notification.hoverBackground": "#493c6c", "VersionControl" :{ - "Log.Commit.currentBranchBackground": "#3e2e61", - "Log.Commit.unmatchedForeground": "#7f80a8" + "Log.Commit.currentBranchBackground": "#333345", + "Log.Commit.unmatchedForeground": "#7f80a8", + + "GitLog.localBranchIconColor": "#65a05c", + "GitLog.tagIconColor": "#bcc4ce", + "Log.Commit.hoveredBackground": "#5841a7", + "Log.Commit.rowHeight": 30, + "Log.Commit.selectionBackground": "#4a3889", + "Log.Commit.selectionInactiveBackground": "#4a3889" + }, "Tree.background": "#2c2c3e", @@ -43,8 +63,8 @@ "pressedBorderColor": "#4b3a81" }, "Borders": { - "color": "#1b092f", - "ContrastBorderColor": "#1a1328" + "color": "#221b3c", + "ContrastBorderColor": "#221b3c" }, "Button": { "startBackground": "#544c91", @@ -66,11 +86,13 @@ }, "CompletionPopup": { "matchForeground": "#cecb46", - "matchSelectionForeground": "#ffcd7e" + "matchSelectionForeground": "#ffcd7e", + "foreground": "#c2c2c2", + "selectionBackground": "#5d5d84" }, "MenuBar.borderColor": "#221b3c", - "Menu.borderColor": "#140928", - "NavBar.borderColor": "#140928", + "Menu.borderColor": "#221b3c", + "NavBar.borderColor": "#221b3c", "Notification": { @@ -108,9 +130,9 @@ "EditorTabs": { "underlinedTabBackground": "#3d3d56", "selectedBackground": "#3d3d56", - "underlineColor": "#44346e" + "underlineColor": "#6b53a5", + "hoverBackground": "#493c6c" }, - "Link": { "activeForeground": "#ede891", "hoverForeground": "#ede891", @@ -137,8 +159,11 @@ }, "WelcomeScreen": { - "Projects.selectionInactiveBackground": "#323247", - "separatorColor": "#323247" + "separatorColor": "#323247", + "borderColor": "#221b3c", + "SidePanel.background": "#2c2c3e", + "Details.background": "2c2c3e" + }, "ValidationTooltip": { @@ -175,7 +200,7 @@ "separatorForeground": "#654bbe", "Advertiser": { "background": "#323247", - "borderColor": "#140928", + "borderColor": "#221b3c", "borderInsets": "3,8,5,0" } }, @@ -185,7 +210,7 @@ "offForeground": "#646464", "offBackground": "#232332", "buttonColor": "#411e85", - "borderColor": "#140928" + "borderColor": "#221b3c" }, "ToolTip": { "background": "#5c5c83", @@ -212,12 +237,15 @@ }, "DragAndDrop": { "areaForeground": "#f5f5f5", - "areaBackground": "#282839", - "areaBorderColor": "#140928" + "rowBackground": "#2828399a", + "areaBackground": "#2828399a", + "areaBorderColor": "#221b3c", + "borderColor": "#221b3c" }, "Plugins": { "SectionHeader.background": "#392c63", "tagBackground": "#40405a", + "hoverBackground": "#5e4e93", "lightSelectionBackground": "#48387e" }, "TabbedPane": { @@ -242,7 +270,7 @@ "hoverThumbBorderColor" : "#281c39ff", "hoverThumbColor": "#423162ff", "hoverTrackColor": "#2d2240ff", - "thumbBorderColor": "#261b3bff" + "thumbBorderColor": "#221b3cff" }, "Mac" : { "Transparent": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json index c579f01b..9e6fef9e 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json @@ -5,17 +5,26 @@ "editorScheme": "/colors/Dark.icls", "icons": { "ColorPalette": { + "#2b2d30": "#323130", + "#3574f0": "#ffb900", + "#3c3f41": "#323130", + "#43494a": "#424140", + "#6B6B6B": "#525150", + "#134d80": "#202635", + "#a1a3a4": "light7", + "#A7A7A7": "light4", + "#3D6185": "#ffb900", "Actions.GreyInline.Dark": "light4", - "Checkbox.Background.Disabled.Dark": "dark6", - "Checkbox.Background.Default.Dark": "dark8", - "Checkbox.Background.Selected.Dark": "dark8", - "Checkbox.Focus.Thin.Selected.Dark": "dark10", - "Checkbox.Focus.Wide.Dark": "dark10", - "Checkbox.Foreground.Selected.Dark": "accent", + "Checkbox.Background.Disabled.Dark": "#323130", + "Checkbox.Background.Default.Dark": "#424140", + "Checkbox.Background.Selected.Dark": "#424140", + "Checkbox.Focus.Thin.Selected.Dark": "#525150", + "Checkbox.Focus.Wide.Dark": "#525150", + "Checkbox.Foreground.Selected.Dark": "#ffb900", + "Checkbox.Border.Selected": "#ffb900", "Checkbox.Border.Default.Dark": "dark9", "Checkbox.Border.Disabled.Dark": "dark7", "Checkbox.Border.Selected.Dark": "dark10", - "Tree.iconColor": "accent", "Actions.Blue": "blue", "Actions.Green": "green", "Actions.Grey": "dark10", @@ -43,16 +52,16 @@ "dark8": "#424140", "dark9": "#474645", "dark10": "#525150", - "accent": "#ffB900", + "accent": "#ffb900", "green": "#92D923", - "greenDark": "#3d521b", - "blueDark": "#0078D7", - "blue": "#5EFBEF", - "red": "#e81123", - "redDark": "#8c131c", - "yellow": "#ffB900", - "yellowLight": "#ffc900", - "yellowDark": "#cc9300", + "greenDark": "#92D923a0", + "blueDark": "#253047a0", + "blue": "#409cff", + "red": "#d70751", + "redDark": "#260b08a0", + "yellow": "#ffb900", + "yellowLight": "#f5d277", + "yellowDark": "#ffb900a0", "light1": "#6f6e6d", "light2": "#7f7e7d", "light3": "#8f8e8d", @@ -66,32 +75,32 @@ }, "ui": { "*": { - "arc": 0, - "selectedBackground": "dark4", - "selectionBackground": "dark3", - "selectionInactiveBackground": "dark4", - "selectedInactiveBackground": "dark5", - "hoverBackground": "dark4", - "headerBackground": "dark5", "background": "dark6", + "borderColor": "dark8", "disabledBackground": "dark7", - "inactiveBackground": "dark8", - "lineSeparatorColor": "dark9", - "separatorColor": "dark10", - "borderColor": "dark10", + "disabledForeground": "light5", + "disabledText": "light3", "focusedBorderColor": "dark10", - "disabledForeground": "light1", - "disabledText": "light2", - "foreground": "light6", + "foreground": "light7", + "headerBackground": "dark5", + "hoverBackground": "dark5", + "inactiveBackground": "dark8", "inactiveForeground": "light4", "infoForeground": "light3", - "selectionForeground": "light10", - "shortcutForeground": "light7" + "lineSeparatorColor": "dark9", + "selectedBackground": "dark4", + "selectedInactiveBackground": "dark5", + "selectionBackground": "dark4", + "selectionForeground": "light8", + "selectionInactiveBackground": "dark6", + "separatorColor": "dark10", + "shortcutForeground": "light10" }, "ActionButton": { - "pressedBackground": "dark3", "hoverBorderColor": "dark10", - "pressedBorderColor": "dark10" + "separatorColor": "dark10", + "pressedBackground": "dark4", + "pressedBorderColor": "dark7" }, "Button": { "default": { @@ -105,10 +114,10 @@ }, "focusedBorderColor": "dark10", "disabledText": "light2", + "disabledBorderColor": "dark8", "endBackground": "dark8", "endBorderColor": "dark9", - "foreground": "light8", - "disabledBorderColor": "dark8", + "foreground": "light9", "startBackground": "dark8", "startBorderColor": "dark9" }, @@ -116,31 +125,32 @@ "ContrastBorderColor": "dark10", "color": "dark9" }, - "CheckBox": { - "select": "light10" - }, + "CheckBox": { "select": "light10" }, + "CheckBoxMenuItem": { "background": "dark7", "selectionBackground": "dark4" }, "ColorChooser": { "foreground": "light6", "background": "dark6" }, "ComboBox": { "ArrowButton": { - "disabledIconColor": "light2", - "iconColor": "yellow", + "disabledIconColor": "light1", + "iconColor": "accent", "background": "dark7", "nonEditableBackground": "dark7" }, - "background": "dark8", + "background": "dark7", "disabledForeground": "light2", + "foreground": "light8", "modifiedItemForeground": "yellow", "nonEditableBackground": "dark8" }, "CompletionPopup": { "Advertiser": { - "background": "dark5", - "foreground": "light5" + "background": "dark7", + "foreground": "light4" }, - "foreground": "light6", + "selectionBackground": "dark4", + "foreground": "light8", "matchForeground": "accent" }, "ComplexPopup": { @@ -149,19 +159,19 @@ } }, "Component": { - "arc": 0, "disabledBorderColor": "dark8", "borderColor": "dark9", "errorFocusColor": "red", + "iconColor": "accent", "focusColor": "dark10", - "focusedBorderColor": "dark10", + "focusedBorderColor": "dark9", "inactiveErrorFocusColor": "redDark", "inactiveWarningFocusColor": "yellowDark", "infoForeground": "light3", "warningFocusColor": "yellow" }, "Counter": { - "background": "dark3", + "background": "dark4", "foreground": "yellow" }, "Debugger": { @@ -179,38 +189,42 @@ }, "DefaultTabs": { "underlineHeight": 1, - "background": "dark6", + "background": "dark7", "inactiveUnderlineColor": "yellowDark", "underlineColor": "accent", - "underlinedTabBackground": "dark4" + "underlinedTabBackground": "dark5" }, "DragAndDrop": { - "areaBackground": "dark8", + "areaBackground": "blueDark", + "rowBackground": "blueDark", "areaForeground": "light4" }, "Editor": { "SearchField": { - "background": "dark8" + "background": "dark7" }, "Toolbar.borderColor": "dark8", - "background": "dark4", + "background": "dark5", "shortcutForeground": "light5" }, "EditorPane": { - "inactiveBackground": "dark7", - "inactiveForeground": "light3", + "inactiveBackground": "dark8", + "inactiveForeground": "light2", "splitBorder": "dark8", - "background": "dark5" + "selectionBackground": "dark4", + "background": "dark7" }, "EditorTabs": { - "underlineHeight": 1 + "inactiveUnderlineColor": "dark10", + "borderColor": "dark10", + "background": "dark6" }, "FileColor": { - "Gray": "dark5", - "Blue": "#23282d", + "Gray": "dark7", + "Blue": "blueDark", "Green": "#232d28", "Orange": "#2d2823", - "Rose": "#2d2323", + "Rose": "redDark", "Violet": "#2D232D", "Yellow": "#3b3b19" }, @@ -229,13 +243,15 @@ "errorBackground": "red", "infoBackground": "blue", "successBackground": "green", + "dotRadius": 4, + "borderWidth": 1, "warningBackground": "yellow" }, "InformationHint": { "borderColor": "green" }, "InplaceRefactoringPopup": { - "borderColor": "yellow" + "borderColor": "blue" }, "Label": { "errorForeground": "red", @@ -249,54 +265,62 @@ "activeForeground": "accent", "hoverForeground": "light10", "secondaryForeground": "blue", - "visitedForeground": "blueDark", - "pressedForeground": "yellowDark" + "visitedForeground": "light10", + "pressedForeground": "light4" }, "List": { "Tag": { - "background": "dark7", - "foreground": "light6" + "background": "dark6" }, "background": "dark7", - "hoverInactiveBackground": "dark5", - "hoverBackground": "dark4", + "hoverInactiveBackground": "dark6", + "hoverBackground": "dark5", "selectionBackground": "dark4", "selectionInactiveBackground": "dark5" }, "MemoryIndicator": { - "allocatedBackground": "dark10", + "allocatedBackground": "dark7", "usedBackground": "redDark" }, "Menu": { - "Selection.arc": 0, "borderColor": "dark9", + "background": "dark7", + "separatorColor": "dark8", "disabledBackground": "dark8", + "selectionBackground": "dark5", "acceleratorSelectionForeground": "light10", "acceleratorForeground": "light10" }, "Notification": { - "arc": 0, "ToolWindow": { - "errorBackground": "dark4", - "errorBorderColor": "red", - "errorForeground": "light10", - "informativeBackground": "dark4", - "informativeBorderColor": "green", - "informativeForeground": "light10", - "warningBackground": "dark4", + "errorBackground": "dark5", + "errorBorderColor": "dark10", + "errorForeground": "light6", + "informativeBackground": "blueDark", + "informativeBorderColor": "blue", + "informativeForeground": "light6", + "warningBackground": "yellowDark", "warningBorderColor": "yellow", - "warningForeground": "light10" + "warningForeground": "light6" }, - "background": "dark4", - "borderColor": "dark9", - "errorBackground": "dark4", - "errorBorderColor": "red", + "borderColor": "dark10", + "background": "blueDark", + "arc": 12, + "Button.background": "dark8", + + "Button.borderColor": "dark10", + "linkForeground": "accent", + "Button.foreground": "light10", + "errorBackground": "redDark", + "errorBorderColor": "dark10", + "MoreButton.foreground": "light6", "errorForeground": "light10", "foreground": "light10" }, "NotificationsToolwindow": { - "newNotification.background": "dark4", - "newNotification.hoverBackground": "dark3" + "newNotification.background": "dark5", + "Notification.hoverBackground": "dark6", + "newNotification.hoverBackground": "dark4" }, "Panel": { "background": "dark6", @@ -304,10 +328,10 @@ }, "ParameterInfo": { "background": "dark5", - "currentOverloadBackground": "yellow", - "currentParameterForeground": "blue", + "currentOverloadBackground": "light7", + "currentParameterForeground": "light5", "foreground": "light6", - "infoForeground": "light2", + "infoForeground": "light3", "lineSeparatorColor": "dark9" }, "PasswordField": { @@ -327,41 +351,45 @@ "background": "dark8" }, "SectionHeader": { - "background": "dark5", - "foreground": "light5" + "background": "dark4", + "foreground": "light4" }, - "hoverBackground": "dark4", + "Tab": { + "hoverBackground": "dark5", + "selectedBackground": "dark4", + "selectedForeground": "light4" + }, + "hoverBackground": "dark5", "background": "dark7", "lightSelectionBackground": "dark5", "tagBackground": "dark8", "tagForeground": "light10" }, "Popup": { + "borderColor": "dark9", + "inactiveBorderColor": "dark8", + "innerBorderColor": "dark9", "Advertiser": { "background": "dark4", - "borderColor": "dark8", - "foreground": "light3" + "borderColor": "dark7", + "foreground": "light4" }, "Header": { - "activeBackground": "dark4", - "activeForeground": "light4", - "inactiveBackground": "dark5" + "activeBackground": "dark5", + "activeForeground": "light5", + "inactiveForeground": "light6", + "inactiveBackground": "dark6" }, - "Selection": { - "arc": 0 - } + "separatorColor": "dark8" }, "PopupMenu": { - "Selection": { - "arc": 0 - }, - "background": "dark6", - "foreground": "light6" + "background": "dark7", + "foreground": "light7" }, "ProgressBar": { "failedColor": "red", "failedEndColor": "dark6", - "indeterminateEndColor": "yellowDark", + "indeterminateEndColor": "#ffb900f0", "indeterminateStartColor": "yellow", "passedColor": "green", "passedEndColor": "dark6", @@ -376,7 +404,8 @@ }, "RunWidget": { "background": "dark6", - "pressedBackground": "dark3", + "pressedBackground": "dark4", + "runModeIconColor": "light10", "runningBackground": "dark5" }, "ScrollBar": { @@ -395,12 +424,12 @@ "settingsBackground": "dark5" }, "SearchField": { - "background": "dark9", - "borderColor": "dark9", - "infoForeground": "light2" + "background": "dark8", + "borderColor": "dark10", + "infoForeground": "light3" }, "Tab": { - "selectedBackground": "dark2", + "selectedBackground": "dark3", "selectedForeground": "yellow" } }, @@ -418,7 +447,7 @@ "separatorColor": "dark9" }, "SidePanel": { - "background": "dark5" + "background": "dark7" }, "SpeedSearch": { "borderColor": "dark9", @@ -426,32 +455,31 @@ "foreground": "yellow" }, "SplitPane": { - "background": "dark5", + "background": "dark", "highlight": "yellow" }, "TabbedPane": { "contentAreaColor": "dark7", - "disabledForeground": "light2", - "disabledUnderlineColor": "light2", + "disabledForeground": "light3", + "disabledUnderlineColor": "light3", "focusColor": "dark4", "focus": "dark9", - "tabSelectionArc": 0, "underlineColor": "accent" }, "Table": { "background": "dark7", - "alternativeRowBackground": "dark5", + "alternativeRowBackground": "dark6", "dropLineColor": "dark10", "dropLineShortColor": "dark10", - "focusCellBackground": "dark4", + "focusCellBackground": "dark5", "focusCellForeground": "yellow", - "lightSelectionBackground": "dark4", + "lightSelectionBackground": "dark5", "gridColor": "dark9", "sortIconColor": "yellow", "stripeColor": "dark9" }, "TableHeader": { - "background": "dark4", + "background": "dark5", "bottomSeparatorColor": "dark9" }, "TextArea": { @@ -466,20 +494,20 @@ "foreground": "light6", "highlight": "yellow", "inactiveForeground": "light2", - "selectionBackground": "dark4", + "selectionBackground": "dark5", "selectionForeground": "yellow" }, "TextPane": { "background": "dark6", "inactiveBackground": "dark7", - "inactiveForeground": "light2", + "inactiveForeground": "light3", "selectionBackground": "dark4" }, "TitlePane": { "background": "dark5" }, "ToggleButton": { - "buttonColor": "dark9", + "buttonColor": "dark8", "disabledText": "light2", "offBackground": "dark4", "offForeground": "light6", @@ -487,17 +515,18 @@ "onForeground": "dark1" }, "ToolBar": { - "borderHandleColor": "dark9" + "background": "dark5", + "borderHandleColor": "dark10" }, "ToolTip": { "Actions.background": "dark5", "Actions.infoForeground": "light3", "background": "dark5", - "paintBorder": true, "infoForeground": "light2" }, "ToolWindow": { "Button": { + "hoverBackground": "dark5", "selectedBackground": "dark4", "selectedForeground": "yellow" }, @@ -509,43 +538,51 @@ "underlineHeight": 1, "hoverInactiveBackground": "dark5", "inactiveUnderlineColor": "yellowDark", - "underlinedTabInactiveBackground": "dark3", - "underlinedTabBackground": "dark2", + "underlinedTabInactiveBackground": "dark4", + "underlinedTabBackground": "dark3", "underlineColor": "yellow" }, "background": "dark7" }, + "GotItTooltip.arc": 4, "Tree": { + "Selection": { + "arc": 4 + }, "background": "dark7", - "foreground": "light6", - "hash": "dark9", + "errorForeground": "red", + "foreground": "light7", + "hash": "dark10", "hoverInactiveBackground": "dark5", - "modifiedItemForeground": "yellow", - "selectionInactiveBackground": "dark5" + "modifiedItemForeground": "blue", + "selectionBackground": "dark5", + "selectionInactiveBackground": "dark6" }, "ScrollPane": { - "background": "dark7", + "background": "dark6", "foreground": "light6" }, "ValidationTooltip": { - "errorBackground": "dark4", + "errorBackground": "redDark", "errorBorderColor": "red", - "warningBackground": "dark4", + "warningBackground": "yellowDark", "warningBorderColor": "yellow" }, "VersionControl": { - "MarkerPopup.Toolbar.background": "dark4", + "MarkerPopup.Toolbar.background": "dark5", "FileHistory": { "Commit.selectedBranchBackground": "dark7" }, "Log": { "Commit": { - "currentBranchBackground": "dark7", + "currentBranchBackground": "dark6", "unmatchedForeground": "light2", "selectionForeground": "light10", - "selectionInactiveBackground": "dark9", - "hoveredBackground": "dark3", - "selectionBackground": "dark4" + "Reference.foreground": "accent", + "selectionInactiveBackground": "dark5", + "hoveredBackground": "dark5", + "selectionBackground": "dark4", + "selectionInactiveForeground": "light4" } } }, @@ -554,19 +591,26 @@ "foreground": "light7" }, "WelcomeScreen": { + "captionBackground": "dark5", "Details": { - "background": "dark7" + "background": "dark6" }, "Projects": { - "background": "dark6", - "selectionBackground": "dark55", - "selectionInactiveBackground": "dark5" + "actions.selectionBackground": "dark5", + "background": "dark7", + "actions.selectionBorderColor": "dark10", + "selectionBackground": "dark5", + "selectionInactiveBackground": "dark6" }, "SidePanel": { - "background": "dark5" + "background": "dark7" }, + "footerBackground": "dark4", + "headerBackground": "dark5", "background": "dark6", - "separatorColor": "dark9" - },"Window.border": "0,0,0,0,525150" + "groupIconBorderColor": "dark9", + "borderColor": "dark9", + "separatorColor": "dark8" + } } } diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json index 7bba8603..29fa55d5 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/nord.theme.json @@ -1,7 +1,7 @@ { "name": "Nord", "dark": true, - "author": "Arctic Ice Studio", + "author": "Sven Greb", "editorScheme": "/themes/nord.xml", "ui": { "*": { 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 2b384043..8da5a942 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 @@ -52,8 +52,8 @@ "ActionButton": { "hoverBackground": "#3d424b", "hoverBorderColor": "#3d424b", - "pressedBackground": "#333841", - "pressedBorderColor": "#333841" + "pressedBackground": "#3f444d", + "pressedBorderColor": "#3f444d" }, "BookmarkIcon.background": "#d9a343",