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 52107a12..de245e6a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -37,6 +37,7 @@ import com.formdev.flatlaf.json.ParseException; import com.formdev.flatlaf.util.ColorFunctions; import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.StringUtils; +import com.formdev.flatlaf.util.SystemInfo; /** * This class supports loading IntelliJ .theme.json files and using them as a Laf. @@ -314,8 +315,19 @@ public class IntelliJTheme @SuppressWarnings( "unchecked" ) private void apply( String key, Object value, UIDefaults defaults, ArrayList defaultsKeysCache, Set uiKeys ) { if( value instanceof Map ) { - for( Map.Entry e : ((Map)value).entrySet() ) - apply( key + '.' + e.getKey(), e.getValue(), defaults, defaultsKeysCache, uiKeys ); + Map map = (Map)value; + if( map.containsKey( "os.default" ) || map.containsKey( "os.windows" ) || map.containsKey( "os.mac" ) || map.containsKey( "os.linux" ) ) { + String osKey = SystemInfo.isWindows ? "os.windows" + : SystemInfo.isMacOS ? "os.mac" + : SystemInfo.isLinux ? "os.linux" : null; + if( osKey != null && map.containsKey( osKey ) ) + apply( key, map.get( osKey ), defaults, defaultsKeysCache, uiKeys ); + else if( map.containsKey( "os.default" ) ) + apply( key, map.get( "os.default" ), defaults, defaultsKeysCache, uiKeys ); + } else { + for( Map.Entry e : map.entrySet() ) + apply( key + '.' + e.getKey(), e.getValue(), defaults, defaultsKeysCache, uiKeys ); + } } else { if( "".equals( value ) ) return; // ignore empty value diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json index 021630a8..ede6fb65 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json @@ -127,7 +127,11 @@ "secondaryForeground": "#7ac2cc" }, - "List.background": "#eef0f4", + "List": { + "background": "#eef0f4", + "hoverBackground": "#dae6eb", + "hoverInactiveBackground": "#dae6eb" + }, "Notification": { "MoreButton.innerBorderColor": "#bec5cd", @@ -143,6 +147,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#dae6ebB3", + "newNotification.hoverBackground": "#dae6eb", + "Notification.hoverBackground": "#dae6eb" + }, + "PasswordField.background": "#FFFFFF", "Plugins": { @@ -151,7 +161,8 @@ "SectionHeader.foreground": "#808080", "SectionHeader.background": "#edeef2", "Tab.selectedBackground": "#cacccf", - "Tab.hoverBackground": "#cacccf" + "Tab.hoverBackground": "#cacccf", + "hoverBackground": "#e6eef2" }, "Popup": { @@ -249,7 +260,12 @@ } }, - "Tree.background": "#eef0f4", + "Tree": { + "background": "#eef0f4", + "hoverBackground": "#dae6eb", + "hoverInactiveBackground": "#dae6eb", + "hash": "#d0d5db" + }, "WelcomeScreen": { "Details.background": "#eef0f4", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json index 2cfc2bab..79e23c49 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json @@ -120,7 +120,8 @@ "DefaultTabs": { "underlineColor": "#9649cc", "inactiveUnderlineColor": "#877399", - "hoverBackground": "#dfb3ff1a" + "hoverBackground": "#dfb3ff1a", + "borderColor": "#1a1721" }, "DragAndDrop": { @@ -168,6 +169,11 @@ "visitedForeground": "#7094FF" }, + "List": { + "hoverBackground": "#00000033", + "hoverInactiveBackground": "#00000033" + }, + "MenuBar.borderColor": "#1a1721", "NavBar.borderColor": "#1a1721", @@ -197,6 +203,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#3D3952B3", + "newNotification.hoverBackground": "#3D3952", + "Notification.hoverBackground": "#3D3952" + }, + "MemoryIndicator": { "allocatedBackground": "#352140", "usedBackground": "#533473" @@ -211,6 +223,8 @@ }, "Plugins": { + "hoverBackground": "#00000022", + "Tab": { "selectedForeground": "#D0D0D9", "selectedBackground": "#593f73", @@ -284,6 +298,13 @@ "SearchOption.selectedBackground": "#424885", + "SegmentedButton": { + "selectedButtonColor": "#45405C", + "focusedSelectedButtonColor": "#693687", + "selectedStartBorderColor": "#4E4C63", + "selectedEndBorderColor": "#4E4C63" + }, + "SpeedSearch": { "foreground": "#D0D0D9", "borderColor": "#69418c", @@ -310,7 +331,8 @@ "Table": { "stripeColor": "#323242", - "hoverBackground": "#00000028" + "hoverBackground": "#00000028", + "gridColor": "#1a1721" }, "TextArea": { @@ -360,7 +382,12 @@ } }, - "Tree.rowHeight": 20, + "Tree": { + "rowHeight": 20, + "hash": "#4E4C63", + "hoverBackground": "#00000033", + "hoverInactiveBackground": "#00000033" + }, "ValidationTooltip": { "errorBackground": "#802d43", 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 d9081180..1da5312d 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 @@ -38,6 +38,26 @@ "pressedBackground": "hoverBackground", "pressedBorderColor": "hoverBackground" }, + "Bookmark": { + "iconBackground": "accentColor", + "Mnemonic": { + "iconForeground": "primaryForeground", + "iconBackground": "#8d6b81", + "iconBorderColor": "accentColor" + } + }, + "BookmarkMnemonicAssigned": { + "foreground": "primaryForeground", + "background": "#786299", + "borderColor": "secondaryAccentColor" + }, + "BookmarkMnemonicAvailable": { + }, + "BookmarkMnemonicCurrent": { + "foreground": "primaryForeground", + "background": "#8d6b81", + "borderColor": "accentColor" + }, "Button": { "foreground": "primaryForeground", "startBorderColor": "selectionBackground", @@ -90,7 +110,7 @@ "inactiveWarningFocusColor": "#f1fa8c" }, "DragAndDrop": { - "areaBorderColor": "selectionBackground" + "borderColor": "selectionBackground" }, "Editor": { "background": "secondaryBackground", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json index ce9dcb9b..68b42d2a 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json @@ -111,6 +111,11 @@ "secondaryForeground": "#77a8d9" }, + "List": { + "hoverBackground": "#00000010", + "hoverInactiveBackground": "#00000010" + }, + "Notification": { "background": "#f7f8fa", "borderColor": "#D4D6D9", @@ -131,6 +136,12 @@ } }, + "NotificationsToolwindow": { + "newNotification.background": "#dae9f7B3", + "newNotification.hoverBackground": "#00000009", + "Notification.hoverBackground": "#00000009" + }, + "PasswordField.background": "#FFFFFF", "Plugins": { @@ -140,7 +151,7 @@ "Tab.selectedBackground": "#D5D6D7", "Tab.hoverBackground": "#D5D6D7", "lightSelectionBackground": "#E9EFF7", - "hoverBackground": "#f7faff" + "hoverBackground": "#F8F8F8" }, "Popup": { @@ -225,7 +236,11 @@ } }, - "Tree.rowHeight": 22, + "Tree": { + "rowHeight": 22, + "hoverBackground": "#00000010", + "hoverInactiveBackground": "#00000010" + }, "VersionControl": { "Log.Commit.currentBranchBackground": "#e6f0f2", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json index 415df184..8a80d74e 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark Contrast.theme.json @@ -7,13 +7,14 @@ "bg30": "#2f343f30", "fg": "#D3DAE3", "text": "#8b9eb5", - "selBg": "#414181", + "selBg": "#8888FF", + "selBg20": "#8888FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#404552", "excl": "#37373d", - "second": "#393f4c", - "dis": "#a2a2a2", + "second": "#393f4c45", + "dis": "#D3DAE3", "accent": "#42A5F5", "accent2": "#42A5F52", "accent50": "#42A5F550", @@ -25,6 +26,7 @@ "hl": "#393f4c", "notif": "#262a33", "hc": "#262b33", + "shadow": "undefined", "white": "#CF6A4C", "blue": "#7587A6", "red": "#CF6A4C", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json index 3be1dfdc..f17bbef6 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Arc Dark.theme.json @@ -7,13 +7,14 @@ "bg30": "#2f343f30", "fg": "#D3DAE3", "text": "#8b9eb5", - "selBg": "#414181", + "selBg": "#8888FF", + "selBg20": "#8888FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#404552", "excl": "#37373d", - "second": "#393f4c", - "dis": "#a2a2a2", + "second": "#393f4c45", + "dis": "#D3DAE3", "accent": "#42A5F5", "accent2": "#42A5F52", "accent50": "#42A5F550", @@ -25,6 +26,7 @@ "hl": "#393f4c", "notif": "#262a33", "hc": "#2f343f", + "shadow": "undefined", "white": "#CF6A4C", "blue": "#7587A6", "red": "#CF6A4C", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json index b13f88f5..6ea1b4e9 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#979FAD", "text": "#979FAD", "selBg": "#4D515D", + "selBg20": "#4D515D20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#282C34", @@ -25,6 +26,7 @@ "hl": "#383D48", "notif": "#282C34", "hc": "#21252B", + "shadow": "undefined", "white": "#D19A66", "blue": "#61AEEF", "red": "#e06c75", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json index 723606b3..5d9b3096 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#979FAD", "text": "#979FAD", "selBg": "#4D515D", + "selBg20": "#4D515D20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#282C34", @@ -25,6 +26,7 @@ "hl": "#383D48", "notif": "#282C34", "hc": "#282C34", + "shadow": "undefined", "white": "#D19A66", "blue": "#61AEEF", "red": "#e06c75", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json index a3374c18..a4d09854 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#232324", "text": "#7f7f7f", "selBg": "#FFFFFF", + "selBg20": "#FFFFFF20", "selFg": "#232324", "activeFg": "#232324", "border": "#DBDBDC", @@ -18,13 +19,14 @@ "accent2": "#2979ff2", "accent50": "#2979ff50", "accent70": "#2979ff70", - "cs": "#eaeaea", + "cs": "#eaeae", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#dbdbdc", - "hl": "#DBDBDC", + "tree": "#DBDBDC80", + "hl": "#FFFFFF", "notif": "#F2F2F2", - "hc": "#eaeaea", + "hc": "#eaeae", + "shadow": "undefined", "white": "#986801", "blue": "#4078F2", "red": "#E4564A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json index db3b5085..df7a0d5a 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Atom One Light.theme.json @@ -8,6 +8,7 @@ "fg": "#232324", "text": "#7f7f7f", "selBg": "#FFFFFF", + "selBg20": "#FFFFFF20", "selFg": "#232324", "activeFg": "#232324", "border": "#DBDBDC", @@ -18,13 +19,14 @@ "accent2": "#2979ff2", "accent50": "#2979ff50", "accent70": "#2979ff70", - "cs": "#eaeaea", + "cs": "#eaeae", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#dbdbdc", - "hl": "#DBDBDC", + "tree": "#DBDBDC80", + "hl": "#FFFFFF", "notif": "#F2F2F2", "hc": "#F4F4F4", + "shadow": "undefined", "white": "#986801", "blue": "#4078F2", "red": "#E4564A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json index 7ec63144..15abffab 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#F8F8F2", "text": "#6272A4", "selBg": "#44475A", + "selBg20": "#44475A20", "selFg": "#8BE9FD", "activeFg": "#FFFFFF", "border": "#21222C", @@ -25,6 +26,7 @@ "hl": "#6272A4", "notif": "#1D2228", "hc": "#191A21", + "shadow": "undefined", "white": "#F8F8F2", "blue": "#8aff80", "red": "#f780bf", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json index 2195fe58..5df07bd1 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Dracula.theme.json @@ -8,6 +8,7 @@ "fg": "#F8F8F2", "text": "#6272A4", "selBg": "#44475A", + "selBg20": "#44475A20", "selFg": "#8BE9FD", "activeFg": "#FFFFFF", "border": "#21222C", @@ -25,6 +26,7 @@ "hl": "#6272A4", "notif": "#1D2228", "hc": "#282A36", + "shadow": "undefined", "white": "#F8F8F2", "blue": "#8aff80", "red": "#f780bf", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json index 1bfffe4c..e70a8eb7 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Contrast.theme.json @@ -7,7 +7,8 @@ "bg30": "#F7F8FA30", "fg": "#5B6168", "text": "#292D31", - "selBg": "#c6e5ff", + "selBg": "#bbd2f5", + "selBg20": "#bbd2f520", "selFg": "#111111", "activeFg": "#111111", "border": "#DFE1E4", @@ -21,10 +22,11 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e8", + "tree": "#ebebeb", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#fafbfc", + "shadow": "undefined", "white": "#24292E", "blue": "#6F42C1", "red": "#22863A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json index ef305b9b..729dfaa4 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#e1e4e8", "text": "#959da5", "selBg": "#3392FF", + "selBg20": "#3392FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#1b1f23", @@ -25,6 +26,7 @@ "hl": "#444d56", "notif": "#2f363d", "hc": "#1e2428", + "shadow": "undefined", "white": "#d1d5da", "blue": "#b392f0", "red": "#85e89d", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json index 53e4cb4b..4272c409 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#e1e4e8", "text": "#959da5", "selBg": "#3392FF", + "selBg20": "#3392FF20", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#1b1f23", @@ -25,6 +26,7 @@ "hl": "#444d56", "notif": "#2f363d", "hc": "#24292e", + "shadow": "undefined", "white": "#d1d5da", "blue": "#b392f0", "red": "#85e89d", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json index f158c95e..91a28cc3 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/GitHub.theme.json @@ -7,7 +7,8 @@ "bg30": "#F7F8FA30", "fg": "#5B6168", "text": "#292D31", - "selBg": "#c6e5ff", + "selBg": "#bbd2f5", + "selBg20": "#bbd2f520", "selFg": "#111111", "activeFg": "#111111", "border": "#DFE1E4", @@ -21,10 +22,11 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e8", + "tree": "#ebebeb", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#F7F8FA", + "shadow": "undefined", "white": "#24292E", "blue": "#6F42C1", "red": "#22863A", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json index 2ecc877b..4625f336 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#403f53", "text": "#90A7B2", "selBg": "#d3e8f8", + "selBg20": "#d3e8f820", "selFg": "#403f53", "activeFg": "#FFFFFF", "border": "#d9d9d9", @@ -25,6 +26,7 @@ "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#f0f0f0", + "shadow": "undefined", "white": "#4876d6", "blue": "#4876d6", "red": "#994cc3", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json index 94a9d7ba..0610caf0 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Light Owl.theme.json @@ -8,6 +8,7 @@ "fg": "#403f53", "text": "#90A7B2", "selBg": "#d3e8f8", + "selBg20": "#d3e8f820", "selFg": "#403f53", "activeFg": "#FFFFFF", "border": "#d9d9d9", @@ -25,6 +26,7 @@ "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#F0F0F0", + "shadow": "undefined", "white": "#4876d6", "blue": "#4876d6", "red": "#994cc3", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json index d5ba0609..f23ffda9 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro Contrast.theme.json @@ -8,8 +8,9 @@ "fg": "#fcfcfa", "text": "#939293", "selBg": "#6E6C6F", - "selFg": "#ffd866", - "activeFg": "#FFFFFF", + "selBg20": "#6E6C6F20", + "selFg": "#FFFFFF", + "activeFg": "#ffd866", "border": "#2d2a2e", "excl": "#3a3a3c", "second": "#403E41", @@ -25,6 +26,7 @@ "hl": "#5b595c", "notif": "#363437", "hc": "#221F22", + "shadow": "undefined", "white": "#FCFCFA", "blue": "#A9DC76", "red": "#FF6188", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json index 6d816cda..c0bcbfef 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Monokai Pro.theme.json @@ -8,8 +8,9 @@ "fg": "#fcfcfa", "text": "#939293", "selBg": "#6E6C6F", - "selFg": "#ffd866", - "activeFg": "#FFFFFF", + "selBg20": "#6E6C6F20", + "selFg": "#FFFFFF", + "activeFg": "#ffd866", "border": "#2d2a2e", "excl": "#3a3a3c", "second": "#403E41", @@ -25,6 +26,7 @@ "hl": "#5b595c", "notif": "#363437", "hc": "#2D2A2E", + "shadow": "undefined", "white": "#FCFCFA", "blue": "#A9DC76", "red": "#FF6188", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json index a33e3b76..1202dbeb 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#c8d3f5", "text": "#a9b8e8", "selBg": "#444a73", + "selBg20": "#444a7320", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#222436", @@ -25,6 +26,7 @@ "hl": "#444a73", "notif": "#191a2a", "hc": "#191a2a", + "shadow": "undefined", "white": "#c8d3f5", "blue": "#70b0ff", "red": "#ff757f", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json index d5cca660..a6dace57 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Moonlight.theme.json @@ -8,6 +8,7 @@ "fg": "#c8d3f5", "text": "#a9b8e8", "selBg": "#444a73", + "selBg20": "#444a7320", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#222436", @@ -25,6 +26,7 @@ "hl": "#444a73", "notif": "#191a2a", "hc": "#222436", + "shadow": "undefined", "white": "#c8d3f5", "blue": "#70b0ff", "red": "#ff757f", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json index 73e70b58..cc376ab5 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl Contrast.theme.json @@ -7,7 +7,8 @@ "bg30": "#01162730", "fg": "#d6deeb", "text": "#5f7e97", - "selBg": "#084d81", + "selBg": "#5f7e97", + "selBg20": "#5f7e9720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#122d42", @@ -25,6 +26,7 @@ "hl": "#084d81", "notif": "#01111d", "hc": "#010e1a", + "shadow": "undefined", "white": "#addb67", "blue": "#82aaff", "red": "#7fdbca", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json index 63b6d059..ea577cc2 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Night Owl.theme.json @@ -7,7 +7,8 @@ "bg30": "#01162730", "fg": "#d6deeb", "text": "#5f7e97", - "selBg": "#084d81", + "selBg": "#5f7e97", + "selBg20": "#5f7e9720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#122d42", @@ -25,6 +26,7 @@ "hl": "#084d81", "notif": "#01111d", "hc": "#011627", + "shadow": "undefined", "white": "#addb67", "blue": "#82aaff", "red": "#7fdbca", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json index a9454602..6320164f 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#839496", "text": "#586e75", "selBg": "#2E4C52", + "selBg20": "#2E4C5220", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#0D3640", @@ -25,6 +26,7 @@ "hl": "#005a6f", "notif": "#2E4C52", "hc": "#00252E", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json index 16505030..fbab003b 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Dark.theme.json @@ -8,6 +8,7 @@ "fg": "#839496", "text": "#586e75", "selBg": "#2E4C52", + "selBg20": "#2E4C5220", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", "border": "#0D3640", @@ -25,6 +26,7 @@ "hl": "#005a6f", "notif": "#2E4C52", "hc": "#002B36", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json index 13819565..77c76046 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light Contrast.theme.json @@ -8,6 +8,7 @@ "fg": "#586e75", "text": "#93a1a1", "selBg": "#e8dcb6", + "selBg20": "#e8dcb620", "selFg": "#002b36", "activeFg": "#002b36", "border": "#edead9", @@ -25,6 +26,7 @@ "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#eee8d5", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json index 011e660d..3d2e9157 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Solarized Light.theme.json @@ -8,6 +8,7 @@ "fg": "#586e75", "text": "#93a1a1", "selBg": "#e8dcb6", + "selBg20": "#e8dcb620", "selFg": "#002b36", "activeFg": "#002b36", "border": "#edead9", @@ -25,6 +26,7 @@ "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#fdf6e3", + "shadow": "undefined", "white": "#268BD2", "blue": "#B58900", "red": "#268BD2", @@ -48,17 +50,21 @@ "focusColor": "hl", "focusedBorderColor": "accent", "foreground": "fg", + "hoverBorderColor": "hl", "inactiveBackground": "excl", "inactiveForeground": "text", "infoForeground": "text", + "lineSeparatorColor": "hl", + "pressedBorderColor": "hl", "selectionBackground": "selBg", "selectionBackgroundInactive": "second", "selectionForeground": "selFg", "selectionInactiveBackground": "second", - "separatorColor": "border", - "lineSeparatorColor": "hl" + "separatorColor": "border" }, "activeCaption": "bg", + "activeCaptionBorder": "bg", + "activeCaptionText": "fg", "ActionButton": { "focusedBorderColor": "accent50", "hoverBackground": "accent50", @@ -67,13 +73,17 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionToolbar": { + "background": "hc" + }, "AssignedMnemonic": { "background": "hl", "borderColor": "selBg", - "foreground": "fg" + "foreground": "activeFg" }, "Autocomplete": { - "selectionBackground": "selBg" + "selectionBackground": "selBg", + "selectionUnfocus": "hl" }, "AvailableMnemonic": { "background": "button", @@ -81,54 +91,148 @@ "foreground": "fg" }, "BigSpinner.background": "bg", + "Bookmark": { + "iconBackground": "accent", + "Mnemonic": { + "iconBackground": "hl", + "iconBorderColor": "hl", + "iconForeground": "fg" + } + }, + "BookmarkMnemonicAssigned": { + "background": "hl", + "borderColor": "selBg", + "foreground": "selFg" + }, + "BookmarkMnemonicAvailable": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "BookmarkMnemonicCurrent": { + "background": "accent", + "borderColor": "accent", + "foreground": "selFg" + }, + "BookmarkMnemonicIcon": { + "background": "hl", + "borderColor": "hl", + "foreground": "fg" + }, "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", "Button": { "arc": 0, "background": "bg", + "darcula": { + "borderColor": "button", + "defaultBorderColor": "button", + "defaultEndColor": "button", + "defaultFocusedBorderColor": "table", + "defaultOutlineColor": "button", + "defaultStartColor": "button", + "disabledBorderColor": "button", + "disabledOutlineColor": "border", + "disabledText.shadow": "bg", + "endColor": "button", + "focusedBorderColor": "table", + "outlineColor": "button", + "selectedButtonForeground": "selFg", + "selection.color1": "table", + "selection.color2": "table", + "shadowColor": "shadow", + "smallComboButtonBackground": "button", + "startColor": "button" + }, "default": { + "borderColor": "button", "endBackground": "table", "endBorderColor": "table", "focusColor": "accent", "focusedBorderColor": "accent", - "foreground": "activeFg", - "shadowColor": "table", + "foreground": "selFg", + "shadowColor": "shadow", "startBackground": "table", "startBorderColor": "table" }, - "disabledBorderColor": "button", + "disabledBackground": "excl", + "disabledBorderColor": "border", "disabledText": "dis", - "endBackground": "button", + "endBackground": "table", "endBorderColor": "button", "focus": "hl", "focusedBorderColor": "accent", "foreground": "text", "highlight": "selFg", "mt.background": "button", + "mt.color1": "button", + "mt.color2": "button", "mt.foreground": "text", "mt.selectedForeground": "selFg", "mt.selection.color1": "table", "mt.selection.color2": "table", - "shadowColor": "button", + "select": "button", + "shadowColor": "shadow", "shadowWidth": 0, - "startBackground": "button", + "startBackground": "table", "startBorderColor": "button" }, "Canvas": { "Tooltip.background": "notif", "Tooltip.borderColor": "border" }, - "Content": { - "background": "cs", - "selectionBackground": "selBg", - "selectionInactiveBackground": "excl" - }, "CheckBox": { "background": "bg", + "background.selected": "accent", + "borderColor": "bg", + "borderColor.selected": "accent", + "checkSignColor": "bg", + "checkSignColor.selected": "bg", + "checkSignColorDisabled": "bg", + "checkSignColorDisabled.selected": "bg", + "darcula": { + "borderColor1": "fg", + "checkSignColorDisabled": "dis", + "disabledBorderColor1": "dis", + "disabledBorderColor2": "dis", + "inactiveFillColor": "hl" + }, + "disabledBorderColor": "bg", + "disabledBorderColor.selected": "accent", "disabledText": "dis", + "focused.background": "bg", + "focused.background.selected": "accent", + "focusedArmed.background": "bg", + "focusedArmed.background.selected": "accent", "foreground": "fg", - "select": "accent" + "inactiveFillColor": "bg", + "inactiveFillColor.selected": "accent", + "select": "accent", + "shadowColor": "bg", + "shadowColorDisabled": "bg" + }, + "Checkbox": { + "Background.Default": "bg", + "Background.Default.Dark": "bg", + "Background.Disabled": "second", + "Background.Disabled.Dark": "second", + "Background.Selected": "accent", + "Background.Selected.Dark": "accent", + "Border.Default": "hl", + "Border.Default.Dark": "hl", + "Border.Disabled": "second", + "Border.Disabled.Dark": "second", + "Border.Selected": "accent", + "Border.Selected.Dark": "accent", + "Focus.Thin.Default": "bg", + "Focus.Thin.Default.Dark": "bg", + "Focus.Wide.Default": "bg", + "Focus.Wide.Default.Dark": "bg", + "Focus.Thin.Selected": "accent", + "Focus.Thin.Selected.Dark": "accent", + "Focus.Wide.Selected": "accent", + "Focus.Wide.Selected.Dark": "accent" }, "CheckBoxMenuItem": { "acceleratorForeground": "text", @@ -142,10 +246,11 @@ }, "CodeWithMe": { "Avatar.foreground": "fg", + "AccessDisabled.accessDot": "dis", "AccessEnabled": { "accessDot": "accent", "dropdownBorder": "second", - "pillBackground": "$second" + "pillBackground": "second" } }, "ColorChooser": { @@ -159,25 +264,38 @@ "background": "button", "disabledIconColor": "dis", "iconColor": "fg", - "nonEditableBackground": "bg" + "nonEditableBackground": "hc" }, + "PopupBackground": "cs", + "arrowFillColor": "hc", "background": "hc", "buttonBackground": "button", - "darcula.hoveredArrowButtonForeground": "accent", + "darcula": { + "arrowButtonBackground": "hc", + "arrowButtonDisabledForeground": "dis", + "arrowButtonForeground": "fg", + "disabledArrowButtonBackground": "excl", + "editable.arrowButtonBackground": "hc", + "hoveredArrowButtonForeground": "accent", + "nonEditableBackground": "bg" + }, + "disabledBackground": "excl", "disabledForeground": "dis", "foreground": "fg", "modifiedItemForeground": "accent", - "nonEditableBackground": "second", + "nonEditableBackground": "bg", "padding": "5,5,5,5", "selectionBackground": "table", "selectionForeground": "activeFg" }, - "ComboPopup.border": "border", "CompletionPopup": { "background": "second", "foreground": "fg", + "grayForeground": "text", + "grayedForeground": "text", "infoForeground": "text", "matchForeground": "accent", + "matchSelectedForeground": "accent", "matchSelectionForeground": "accent", "nonFocusedState": "false", "selectedForeground": "selFg", @@ -186,21 +304,32 @@ "selectionForeground": "selFg", "selectionGrayForeground": "selFg", "selectionInactiveBackground": "hl", + "selectionInactiveForeground": "text", "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, "Component": { "arc": 4, "borderColor": "hl", - "disabledBorderColor": "button", + "disabledBorderColor": "dis", "focusColor": "accent", "focusedBorderColor": "accent", "hoverIconColor": "accent", - "iconColor": "fg", + "iconColor": "text", + "grayForeground": "text", "infoForeground": "text" }, - "control": "bg", + "Content": { + "background": "cs", + "selectionBackground": "selBg", + "selectionInactiveBackground": "fg" + }, + "control": "button", + "controlLtHighlight": "selFg", "controlText": "text", + "controlHighlight": "hl", + "controlShadow": "excl", + "controlDkShadow": "excl", "Counter": { "background": "accent", "foreground": "selFg" @@ -208,8 +337,14 @@ "CurrentMnemonic": { "background": "accent", "borderColor": "accent", - "foreground": "fg" + "foreground": "selFg" }, + "darcula": { + "background": "bg", + "foreground": "fg", + "primary": "bg" + }, + "desktop": "hc", "Debugger": { "Variables": { "changedValueForeground": "accent", @@ -222,17 +357,18 @@ } }, "DebuggerTabs": { + "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "hl" + "underlinedTabBackground": "table" }, "DebuggerPopup": { - "borderColor": "hl" + "borderColor": "bg" }, "DefaultTabs": { "background": "bg", "borderColor": "bg", "hoverBackground": "table", - "hoverColor": "hc", + "hoverColor": "hl", "hoverMaskColor": "hl", "inactiveColoredFileBackground": "button", "inactiveColoredTabBackground": "bg", @@ -243,41 +379,28 @@ "underlinedTabForeground": "selFg" }, "Desktop.background": "bg", - "DialogWrapper.southPanelBackground": "bg", - "DialogWrapper.southPanelDivider": "bg", - "DragAndDrop": { - "areaBackground": "bg", - "areaBorderColor": "bg", - "areaForeground": "fg" + "Dialog": { + "titleColor": "bg" }, + "DialogWrapper": { + "southPanelBackground": "bg", + "southPanelDivider": "bg" + }, + "DragAndDrop": { + "areaBackground": "tree", + "areaBorderColor": "bg", + "areaForeground": "fg", + "backgroundBorderColor": "bg", + "backgroundColor": "bg", + "borderColor": "accent", + "foregroundColor": "fg" + }, + "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", "shortcutForeground": "text" }, - "EditorPane": { - "background": "hc", - "caretForeground": "accent", - "foreground": "fg", - "inactiveBackground": "bg", - "inactiveForeground": "dis", - "selectionBackground": "selBg", - "selectionForeground": "activeFg" - }, - "EditorTabs": { - "borderColor": "second", - "hoverBackground": "hl", - "hoverColor": "hl", - "hoverMaskColor": "hl", - "inactiveColoredFileBackground": "bg", - "inactiveMaskColor": "bg", - "inactiveUnderlineColor": "dis", - "selectedBackground": "table", - "selectedForeground": "fg", - "underlineColor": "accent", - "underlinedTabBackground": "table", - "underlinedTabForeground": "selFg" - }, "EditorGroupsTabs": { "background": "bg", "borderColor": "second", @@ -288,13 +411,44 @@ "underlinedTabBackground": "table", "underlinedTabForeground": "fg" }, + "EditorPane": { + "background": "hc", + "caretForeground": "accent", + "foreground": "fg", + "inactiveBackground": "bg", + "inactiveForeground": "dis", + "selectionBackground": "selBg", + "selectionForeground": "activeFg" + }, + "EditorTabs": { + "active.background": "table", + "active.foreground": "fg", + "active.underlineColor": "accent", + "background": "bg", + "borderColor": "second", + "foreground": "fg", + "hoverBackground": "hl", + "hoverColor": "hl", + "hoverMaskColor": "hl", + "inactive.maskColor": "bg", + "inactiveColoredFileBackground": "bg", + "inactiveMaskColor": "bg", + "inactiveUnderlineColor": "dis", + "selectedBackground": "table", + "selectedForeground": "fg", + "underlineColor": "accent", + "underlinedTabBackground": "table", + "underlinedTabForeground": "selFg" + }, "FileColor": { "Blue": "#004BA0", "Green": "#387002", "Orange": "#B53D00", "Rose": "#A00037", "Violet": "#4D2C91", - "Yellow": "excl" + "Yellow": "excl", + "Gray": "excl", + "excluded": "excl" }, "FlameGraph": { "JVMBackground": "#89DDF7", @@ -306,18 +460,37 @@ "nativeFocusSearchNotMatchedBackground": "#BB80B3", "nativeSearchNotMatchedBackground": "#C792EA" }, - "Focus.color": "border", + "Focus": { + "Color": "accent50", + "borderColor": "accent50", + "color": "accent50", + "defaultButtonBorderColor": "accent" + }, "FormattedTextField": { "background": "hc", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", "inactiveForeground": "dis", - "selectionBackground": "table", + "selectionBackground": "selBg", "selectionForeground": "activeFg" }, + "Git.Log.Ref": { + "LocalBranch": "accent", + "Other": "text", + "RemoteBranch": "fg", + "Tag": "text" + }, + "Github.List.tallRow": { + "foreground": "fg", + "secondary.foreground": "text", + "selectionBackground": "selBg", + "selectionBackground.unfocused": "hl", + "selectionForeground": "selFg", + "selectionForeground.unfocused": "selFg" + }, "GotItTooltip": { - "background": "bg", + "background": "notif", "borderColor": "notif", "endBackground": "button", "endBorderColor": "button", @@ -332,6 +505,7 @@ "separatorColor": "border" }, "GutterTooltip": { + "borderColor": "bg", "infoForeground": "text", "lineSeparatorColor": "bg" }, @@ -341,12 +515,25 @@ }, "HelpTooltip": { "background": "bg", + "backgroundColor": "bg", "borderColor": "border", "foreground": "fg", "infoForeground": "text", - "shortcutForeground": "text" + "shortcutForeground": "text", + "shortcutTextColor": "text", + "textColor": "fg" + }, + "Hg.Log.Ref": { + "Branch": "accent", + "ClosedBranch": "fg", + "LocalTag": "text", + "MqTag": "text", + "Tag": "text" }, "Hyperlink.linkColor": "accent", + "IconBadge": { + "infoBackground": "accent" + }, "IdeStatusBar.border": "4,4,4,4", "InformationHint.borderColor": "border", "inactiveCaption": "second", @@ -359,20 +546,45 @@ "background": "bg", "borderColor": "bg" }, + "intellijlaf": { + "background": "bg", + "foreground": "fg" + }, "InternalFrame": { "activeTitleForeground": "fg", "background": "bg", + "inactiveTitleBackground": "bg", "inactiveTitleForeground": "text" }, "Label": { "background": "bg", "disabledForeground": "dis", - "disabledShadow": "bg", + "disabledForegroundColor": "dis", + "disabledShadow": "dis", "disabledText": "dis", + "errorForeground": "accent", "foreground": "fg", + "grayForeground": "text", "infoForeground": "text", "selectedDisabledForeground": "fg", - "selectedForeground": "activeFg" + "selectedForeground": "activeFg", + "textForeground": "text" + }, + "Lesson": { + "Badge": { + "newLessonBackground": "accent", + "newLessonForeground": "selFg" + }, + "shortcutBackground": "second", + "stepNumberForeground": "text", + "Tooltip": { + "background": "notif", + "borderColor": "notif", + "foreground": "fg", + "spanBackground": "button", + "spanForeground": "fg", + "stepNumberForeground": "text" + } }, "link": "accent", "Link": { @@ -383,16 +595,33 @@ "visitedForeground": "accent" }, "link.foreground": "accent", + "link.hover.foreground": "accent", + "link.pressed.foreground": "accent", + "link.visited.foreground": "accent", "List": { "background": "second", "foreground": "fg", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", - "selectionBackground": "selBg", "selectionForeground": "selFg", - "selectionInactiveBackground": "tree", + "selectionInactiveBackground": "table", "selectionInactiveForeground": "activeFg" }, + "LiveIndicator": { + "color": "accent" + }, + "MainToolbar": { + "Dropdown.background": "bg", + "Dropdown.hoverBackground": "border", + "Dropdown.pressedBackground": "table", + "Icon.background": "bg", + "Icon.hoverBackground": "border", + "Icon.pressedBackground": "table", + "background": "bg", + "hoverBackground": "border", + "inactiveBackground": "bg", + "pressedBackground": "table" + }, "material": { "background": "bg", "branchColor": "fg", @@ -400,6 +629,7 @@ "foreground": "fg", "mergeCommits": "button", "primaryColor": "text", + "selectionBackground": "selBg", "selectionForeground": "selFg", "tab.backgroundColor": "bg", "tab.borderColor": "accent", @@ -407,12 +637,15 @@ }, "MemoryIndicator": { "allocatedBackground": "second", + "unusedColor": "second", "usedBackground": "hl", "usedColor": "hl" }, + "menu": "bg", + "menuText": "fg", "Menu": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "borderColor": "second", @@ -420,7 +653,7 @@ "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "separatorColor": "border" }, "MenuBar": { @@ -431,19 +664,19 @@ "foreground": "fg", "highlight": "bg", "selectionBackground": "selBg", - "selectionForeground": "selFg", + "selectionForeground": "activeFg", "shadow": "hc" }, "MenuItem": { "acceleratorForeground": "text", - "acceleratorSelectionForeground": "selFg", + "acceleratorSelectionForeground": "activeFg", "background": "bg", "border": "4,2,4,2", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", "selectionBackground": "selBg", - "selectionForeground": "selFg" + "selectionForeground": "activeFg" }, "MlModelBinding.Viewer.CodeEditor.background": "bg", "MnemonicIcon": { @@ -453,7 +686,8 @@ }, "NavBar": { "arrowColor": "fg", - "borderColor": "bg" + "borderColor": "bg", + "selectedColor": "accent" }, "NewClass": { "Panel": { @@ -465,25 +699,54 @@ }, "NewPSD.warning": "accent", "Notification": { + "Error.foreground": "accent", + "Link.foreground": "accent", "background": "notif", "borderColor": "notif", "errorBackground": "notif", "errorBorderColor": "notif", + "errorForeground": "accent", "foreground": "fg", + "linkForeground": "accent", "MoreButton": { "background": "button", "foreground": "fg", "innerBorderColor": "button" }, "ToolWindow": { - "errorBackground": "notif", - "errorBorderColor": "notif", - "informativeBackground": "notif", - "informativeBorderColor": "notif", - "warningBackground": "notif", - "warningBorderColor": "notif" + "errorBackground": "notifError", + "errorBorderColor": "notifError", + "errorForeground": "fg", + "infoForeground": "fg", + "informativeBackground": "notifInfo", + "informativeBorderColor": "notifInfo", + "informativeForeground": "fg", + "warningBackground": "notifWarn", + "warningBorderColor": "notifWarn", + "warningForeground": "fg" + }, + "ToolWindowError": { + "foreground": "fg", + "background": "notifError" + }, + "ToolWindowInfo": { + "foreground": "fg", + "background": "notifInfo" + }, + "ToolWindowWarning": { + "foreground": "fg", + "background": "notifWarn" } }, + "Notifications": { + "background": "notif", + "borderColor": "notif" + }, + "NotificationsToolwindow": { + "Notification.hoverBackground": "tree", + "newNotification.background": "notif", + "newNotification.hoverBackground": "tree" + }, "OnePixelDivider.background": "border", "OptionPane": { "background": "bg", @@ -491,8 +754,8 @@ "messageForeground": "fg" }, "OptionButton": { - "default.separatorColor": "border", - "separatorColor": "border" + "default.separatorColor": "table", + "separatorColor": "button" }, "Outline": { "color": "button", @@ -505,12 +768,15 @@ "mouseShortcutBackground": "bg" }, "ParameterInfo": { + "ContextHelp.foreground": "text", "background": "second", "borderColor": "table", "currentOverloadBackground": "hl", "currentParameterForeground": "accent", + "disabledColor": "dis", "disabledForeground": "dis", "foreground": "fg", + "highlightedColor": "accent", "infoForeground": "text", "lineSeparatorColor": "table" }, @@ -527,10 +793,11 @@ "background": "bg", "disabledForeground": "dis", "eapTagBackground": "hl", - "hoverBackground": "tree", + "hoverBackground": "hl", "lightSelectionBackground": "table", "paidTagBackground": "hl", "selectionBackground": "selBg", + "selectionForeground": "selFg", "tagBackground": "hl", "tagForeground": "accent", "trialTagBackground": "hl", @@ -554,6 +821,9 @@ "foreground": "fg" }, "Tab": { + "active.background": "table", + "active.foreground": "activeFg", + "hover.background": "table", "hoverBackground": "table", "selectedBackground": "table", "selectedForeground": "selFg" @@ -565,6 +835,10 @@ "borderColor": "bg", "foreground": "accent" }, + "Border": { + "color": "cs", + "inactiveColor": "bg" + }, "borderColor": "cs", "inactiveBorderColor": "bg", "innerBorderColor": "second", @@ -573,9 +847,19 @@ "inactiveBackground": "cs" }, "paintBorder": true, + "preferences": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "Separator": { + "foreground": "fg", + "color": "border" + }, "separatorColor": "second", "separatorForeground": "fg", "Toolbar": { + "Border.color": "cs", "Floating.background": "cs", "background": "cs", "borderColor": "cs" @@ -585,6 +869,7 @@ "background": "bg", "border": "2,0,2,0", "foreground": "fg", + "selectionBackground": "selBg", "translucentBackground": "bg" }, "PopupMenuSeparator.height": 10, @@ -592,6 +877,7 @@ "ProgressBar": { "background": "bg", "foreground": "accent", + "halfColor": "hl", "indeterminateEndColor": "accent", "indeterminateStartColor": "accent", "progressColor": "accent", @@ -603,8 +889,20 @@ }, "RadioButton": { "background": "bg", + "darcula": { + "borderColor1": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" + }, "disabledText": "dis", - "foreground": "fg" + "focusColor": "accent", + "foreground": "fg", + "selectionDisabledColor": "bg", + "selectionDisabledShadowColor": "accent", + "selectionEnabledColor": "accent", + "selectionEnabledShadowColor": "accent" }, "RadioButtonMenuItem": { "acceleratorForeground": "text", @@ -617,6 +915,7 @@ "selectionForeground": "selFg" }, "ScreenView.borderColor": "border", + "scrollbar": "bg", "ScrollBar": { "background": "bg", "hoverThumbBorderColor": "accent", @@ -641,6 +940,10 @@ "thumb": "hl", "thumbBorderColor": "accent70", "thumbColor": "accent70", + "Thumb": { + "Hovered.background": "accent", + "NonOpaque.Hovered.background": "accent" + }, "trackColor": "bg30", "Transparent": { "hoverThumbBorderColor": "accent", @@ -656,20 +959,36 @@ "background": "cs", "foreground": "text" }, + "background": "bg", + "Dialog": { + "background": "bg", + "borderColor": "bg", + "foreground": "fg" + }, + "foreground": "fg", "Header": { "background": "bg" }, "List": { - "separatorForeground": "text", - "separatorColor": "border" + "Separator.Color": "border", + "Separator.foreground": "text", + "selectionBackground": "selBg", + "separatorColor": "border", + "separatorForeground": "text" }, "SearchField": { - "background": "bg", - "borderColor": "cs", - "infoForeground": "text" + "Border.color": "hl", + "background": "hc", + "borderColor": "hl", + "grayForeground": "dis", + "infoForeground": "dis" }, + "shortcutForeground": "text", "Tab": { + "active.background": "hl", "active.foreground": "activeFg", + "selected.background": "hl", + "selected.foreground": "activeFg", "selectedBackground": "hl", "selectedForeground": "activeFg" } @@ -688,12 +1007,18 @@ "Ordinal.File.Foreground": "text", "Repeated.File.Foreground": "fg" }, + "SegmentedButton": { + "selectedStartBorderColor": "border", + "selectedEndBorderColor": "border" + }, "Separator": { "background": "second", "foreground": "second", - "separatorColor": "second" + "separatorColor": "border" + }, + "Settings": { + "Spotlight.borderColor": "accent" }, - "Settings.Spotlight.borderColor": "accent", "SidePanel": { "background": "hc" }, @@ -705,19 +1030,22 @@ "majorTickLength": 6, "thumb": "accent", "tickColor": "second", + "track": "table", "trackColor": "table", + "trackDisabled": "hl", "trackWidth": 7 }, + "Space.Review.diffAnchorBackground": "second", "SpeedSearch": { "background": "hl", "borderColor": "border", "errorForeground": "fg", "foreground": "fg" }, - "Space.Review.diffAnchorBackground": "second", "Spinner": { "background": "bg", "border": "3,3,3,3", + "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" }, @@ -728,16 +1056,40 @@ "SplitPaneDivider.draggingColor": "second", "StateWidget.activeBackground": "button", "StatusBar": { - "LightEditBackground": "table", + "background": "bg", + "Breadcrumbs": { + "floatingBackground": "tree", + "floatingForeground": "fg", + "foreground": "fg", + "hoverBackground": "tree", + "hoverForeground": "fg", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "selectionInactiveBackground": "button", + "selectionInactiveForeground": "fg" + }, "borderColor": "bg", - "hoverBackground": "hl" + "bottomColor": "bg", + "hoverBackground": "hl", + "top2Color": "bg", + "topColor": "bg", + "LightEditBackground": "table", + "Widget": { + "foreground": "fg", + "hoverBackground": "hl", + "hoverForeground": "selFg", + "pressedBackground": "button", + "pressedForeground": "fg" + } }, "TabbedPane": { "background": "bg", + "borderColor": "hc", "contentAreaColor": "hl", "contentBorderInsets": "3,1,1,1", - "darkShadow": "border", + "darkShadow": "hc", "disabledForeground": "dis", + "disabledText": "dis", "disabledUnderlineColor": "dis", "focus": "table", "focusColor": "table", @@ -746,9 +1098,15 @@ "highlight": "border", "hoverColor": "hl", "labelShift": 0, + "mt.tab.background": "hc", + "selectHighlight": "hl", + "selected": "selBg", + "selectedColor": "accent", + "selectedDisabledColor": "dis", "selectedForeground": "activeFg", "selectedLabelShift": 0, "selectedTabPadInsets": "0,0,0,0", + "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", "tabSelectionHeight": 2, @@ -769,8 +1127,9 @@ "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", - "hoverBackground": "tree", + "hoverBackground": "hl", "hoverInactiveBackground": "table", + "lightSelectionBackground": "table", "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", @@ -779,22 +1138,31 @@ "selectionInactiveBackground": "table", "selectionInactiveForeground": "selFg", "sortIconColor": "fg", - "stripeColor": "cs" + "stripeColor": "cs", + "stripedBackground": "cs" }, "TableHeader": { - "background": "bg", - "borderColor": "bg", - "bottomSeparatorColor": "second", + "background": "button", + "borderColor": "hl", + "bottomSeparatorColor": "hl", "cellBorder": "4,0,4,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", "height": 25, - "separatorColor": "second" + "hoverBackground": "hl", + "separatorColor": "border" }, - "text": "text", + "Tag": { + "background": "button", + "borderColor": "button", + "foreground": "fg" + }, + "text": "bg", "textInactiveText": "text", + "textHighlight": "selBg", + "textHighlightText": "activeFg", "textText": "text", "TextArea": { "background": "hc", @@ -806,11 +1174,18 @@ }, "TextField": { "background": "hc", + "borderColor": "bg", "caretForeground": "accent", + "disabledBackground": "excl", + "focusedBorderColor": "bg", "foreground": "fg", + "hoverBorderColor": "bg", "inactiveForeground": "dis", - "selectionBackground": "table", - "selectionForeground": "activeFg" + "selectedSeparatorColor": "accent", + "selectionBackground": "selBg", + "selectionForeground": "activeFg", + "separatorColor": "hl", + "separatorColorDisabled": "bg" }, "TextPane": { "background": "hc", @@ -822,46 +1197,89 @@ }, "TitlePane": { "Button.hoverBackground": "hl", - "background": "cs", + "background": "hc", "inactiveBackground": "bg", - "inactiveInfoForeground": "text", + "inactiveInfoForeground": "dis", "infoForeground": "text" }, "TitledBorder.titleColor": "fg", "ToggleButton": { "borderColor": "button", - "buttonColor": "fg", + "buttonColor": "button", "disabledText": "dis", "foreground": "fg", + "off.background": "bg", + "off.foreground": "bg", "offBackground": "bg", "offForeground": "bg", + "on.background": "accent", + "on.foreground": "accent", "onBackground": "accent", "onForeground": "accent" }, + "Toolbar.Floating.background": "button", "ToolBar": { "background": "hc", "borderHandleColor": "text", + "comboBoxButtonBackground": "button", "floatingForeground": "text", "foreground": "fg" }, + "ToolbarComboWidget": { + "background": "button", + "hoverBackground": "hl" + }, + "tooltips": { + "actions.keymap.text.color": "text", + "actions.settings.icon.background.color": "bg", + "description.title.text.color": "fg" + }, "ToolTip": { - "Actions.background": "bg", - "Actions.infoForeground": "text", + "actions": { + "background": "bg" + }, + "Actions": { + "background": "bg", + "grayForeground": "text", + "infoForeground": "text" + }, "background": "notif", "borderColor": "border", "foreground": "fg", "infoForeground": "text", + "Learning": { + "background": "accent", + "borderColor": "accent", + "foreground": "fg", + "spanBackground": "accent50", + "spanForeground": "fg", + "stepNumberForeground": "accent" + }, "separatorColor": "border", "shortcutForeground": "text" }, "ToolWindow": { + "active": { + "Header.background": "second", + "HeaderTab.background": "cs" + }, + "Background": "bg", + "background": "hc", "Button": { "hoverBackground": "table", "selectedBackground": "cs", "selectedForeground": "activeFg" }, - "Header": { + "header": { + "active.background": "second", "background": "bg", + "border.background": "second", + "closeButton.background": "bg", + "tab.selected.active.background": "cs", + "tab.selected.background": "cs" + }, + "Header": { + "background": "second", "borderColor": "second", "inactiveBackground": "bg" }, @@ -869,7 +1287,7 @@ "background": "bg" }, "HeaderTab": { - "borderColor": "hl", + "borderColor": "bg", "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", @@ -878,8 +1296,12 @@ "underlineColor": "accent", "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", - "underlinedTabInactiveBackground": "second", + "underlinedTabInactiveBackground": "hc", "underlinedTabInactiveForeground": "fg" + }, + "inactive": { + "Header.background": "bg", + "HeaderTab.background": "cs" } }, "Tree": { @@ -919,6 +1341,8 @@ "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { + "AddConstraintColor": "accent", + "AddConstraintPlus": "accent", "CSPanel.SelectedBackground": "tree", "CSPanel.SelectedFocusBackground": "selBg", "Component.foreground": "fg", @@ -926,13 +1350,19 @@ "ConstraintSetText.foreground": "text", "CursorTextColor.foreground": "fg", "HoverColor.disabledBackground": "dis", + "Key.selectedForeground": "accent", "Notification.background": "notif", + "PositionMarkColor": "accent", "PrimaryPanel.background": "cs", "SecondaryPanel.background": "bg", "SecondaryPanel.header.background": "cs", "SecondaryPanel.header.foreground": "text", + "TimeCursor.End.selectedForeground": "accent", + "TimeCursor.Start.selectedForeground": "accent", + "TimeCursor.selectedForeground": "accent", "borderColor": "border", "cs_FocusText.infoForeground": "text", + "graphLine.lineSeparatorColor": "accent", "motionGraph.background": "bg", "ourAvg.background": "second", "ourCS.background": "second", @@ -940,6 +1370,7 @@ "ourCS_SelectedBackground.selectionInactiveBackground": "table", "ourCS_SelectedBorder.pressedBorderColor": "hl", "ourCS_SelectedFocusBackground.selectionForeground": "selFg", + "ourCS_SelectedFocusBorder.focusedBorderColor": "accent", "ourCS_TextColor.foreground": "text", "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" @@ -970,6 +1401,7 @@ }, "VersionControl": { "FileHistory.Commit": { + "otherBranchBackground": "bg", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -991,9 +1423,15 @@ "tipIconColor": "text" }, "Log": { - "Commit.currentBranchBackground": "second", - "Commit.hoveredBackground": "tree", - "Commit.unmatchedForeground": "text" + "Commit": { + "currentBranchBackground": "cs", + "hoveredBackground": "tree", + "unmatchedForeground": "text" + } + }, + "Ref": { + "backgroundBase": "hl", + "foreground": "activeFg" }, "RefLabel": { "backgroundBase": "hl", @@ -1007,7 +1445,11 @@ "WelcomeScreen": { "AssociatedComponent.background": "bg", "Details.background": "bg", - "List.background": "cs", + "List": { + "background": "hc", + "selectionBackground": "selBg", + "selectionInactiveBackground": "hl" + }, "SidePanel.background": "second", "background": "bg", "borderColor": "bg", @@ -1015,6 +1457,7 @@ "captionForeground": "fg", "footerBackground": "cs", "footerForeground": "fg", + "groupIconBorderColor": "button", "headerBackground": "bg", "headerForeground": "fg", "separatorColor": "border", @@ -1023,7 +1466,7 @@ "actions.selectionBackground": "hl", "background": "second", "selectionBackground": "selBg", - "selectionInactiveBackground": "second" + "selectionInactiveBackground": "selBg" } }, "Window.border": "border", 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 04f3efa2..7bba8603 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 @@ -164,6 +164,10 @@ "background": "#323846", "selectionInactiveForeground": "#e5e9f0" }, + "MemoryIndicator": { + "allocatedBackground": "#81a1c1", + "usedBackground": "#5e81ac" + }, "Menu": { "background": "#323846", "borderColor": "#3b4252", @@ -231,6 +235,9 @@ "activeBackground": "#434c5e" } }, + "PopupMenu": { + "background": "#323846" + }, "ProgressBar": { "background": "#88c0d0", "failedColor": "#bf616a", 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 d490747c..db985f73 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 @@ -8,7 +8,10 @@ "backgroundColor": "#21252b", "borderColor": "#333841", "infoForeground": "#7e8491", - "foregroundColor": "#abb2bf" + "foregroundColor": "#abb2bf", + "notificationBackground": "#3d424b", + "selectionBackground": "#323844", + "selectionForeground": "#d7dae0" }, "ui": { "*": { @@ -17,10 +20,18 @@ "infoForeground": "#5c6370", - "selectionBackground": "#323844", + "selectionBackground": { + "os.default": "selectionBackground", + "os.windows": "selectionBackground", + "os.mac": "selectionBackground" + }, + "selectionForeground": { + "os.default": "selectionForeground", + "os.windows": "selectionForeground", + "os.mac": "selectionForeground" + }, "selectionInactiveBackground": "#2c313a", "selectionBackgroundInactive": "#2c313a", - "selectionForeground": "#d7dae0", "disabledBackground": "backgroundColor", "inactiveBackground": "backgroundColor", @@ -142,6 +153,9 @@ "Editor": { "background": "#282c34", "foreground": "#abb2bf", + "SearchField": { + "background": "#282c34" + }, "shortcutForeground": "accentColor" }, @@ -192,7 +206,7 @@ }, "Notification": { - "background": "#3d424b", + "background": "notificationBackground", "borderColor": "#53565f", "errorForeground": "#abb2bf", @@ -219,6 +233,10 @@ } }, + "NotificationsToolwindow.newNotification.background" : "notificationBackground", + "NotificationsToolwindow.newNotification.hoverBackground" : "#3d424b", + "NotificationsToolwindow.Notification.hoverBackground" : "#3d424b", + "Panel.background": "backgroundColor", "ParameterInfo": { @@ -314,6 +332,8 @@ "Settings.Spotlight.borderColor": "accentColor", + "StatusBar.background": "baseBackground", + "TabbedPane": { "underlineColor": "accentColor", "contentAreaColor": "#323844", @@ -362,6 +382,7 @@ }, "ToolWindow": { + "background": "backgroundColor", "Button": { "hoverBackground": "#323844", "selectedBackground": "#3d424b",