diff --git a/CHANGELOG.md b/CHANGELOG.md index b909a04e..040a2908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ FlatLaf Change Log #628) - Avoid that accent color affect some colors in some IntelliJ themes. (issue #625) + - Updated "Hiberbee Dark" and "Material Theme UI Lite" themes. - Styling: Fixed resolving of UI variables in styles that use other variables. diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json index f11677b2..4e6cb984 100644 --- a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/intellijthemes/themes.json @@ -144,8 +144,8 @@ "dark": true, "license": "MIT", "licenseFile": "Hiberbee.LICENSE.txt", - "sourceCodeUrl": "https://github.com/Hiberbee/code-highlight-themes", - "sourceCodePath": "blob/latest/src/main/resources/HiberbeeDark.theme.json" + "sourceCodeUrl": "https://github.com/Hiberbee/themes", + "sourceCodePath": "blob/latest/src/main/resources/themes/HiberbeeDark.theme.json" }, "HighContrast.theme.json": { "name": "High contrast", @@ -247,7 +247,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Arc Dark.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Arc Dark.theme.json" }, "material-theme-ui-lite/Arc Dark Contrast.theme.json": { "name": "Material Theme UI Lite / Arc Dark Contrast", @@ -255,7 +255,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Arc Dark Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Arc Dark Contrast.theme.json" }, "material-theme-ui-lite/Atom One Dark.theme.json": { "name": "Material Theme UI Lite / Atom One Dark", @@ -263,7 +263,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Atom One Dark.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Atom One Dark.theme.json" }, "material-theme-ui-lite/Atom One Dark Contrast.theme.json": { "name": "Material Theme UI Lite / Atom One Dark Contrast", @@ -271,21 +271,21 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Atom One Dark Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Atom One Dark Contrast.theme.json" }, "material-theme-ui-lite/Atom One Light.theme.json": { "name": "Material Theme UI Lite / Atom One Light", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Atom One Light.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Atom One Light.theme.json" }, "material-theme-ui-lite/Atom One Light Contrast.theme.json": { "name": "Material Theme UI Lite / Atom One Light Contrast", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Atom One Light Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Atom One Light Contrast.theme.json" }, "material-theme-ui-lite/Dracula.theme.json": { "name": "Material Theme UI Lite / Dracula", @@ -293,7 +293,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Dracula.theme.json" }, "material-theme-ui-lite/Dracula Contrast.theme.json": { "name": "Material Theme UI Lite / Dracula Contrast", @@ -301,21 +301,21 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Dracula Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Dracula Contrast.theme.json" }, "material-theme-ui-lite/GitHub.theme.json": { "name": "Material Theme UI Lite / GitHub", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/GitHub.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/GitHub.theme.json" }, "material-theme-ui-lite/GitHub Contrast.theme.json": { "name": "Material Theme UI Lite / GitHub Contrast", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/GitHub Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/GitHub Contrast.theme.json" }, "material-theme-ui-lite/GitHub Dark.theme.json": { "name": "Material Theme UI Lite / GitHub Dark", @@ -323,7 +323,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/GitHub Dark.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/GitHub Dark.theme.json" }, "material-theme-ui-lite/GitHub Dark Contrast.theme.json": { "name": "Material Theme UI Lite / GitHub Dark Contrast", @@ -331,21 +331,21 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/GitHub Dark Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/GitHub Dark Contrast.theme.json" }, "material-theme-ui-lite/Light Owl.theme.json": { "name": "Material Theme UI Lite / Light Owl", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Light Owl.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Light Owl.theme.json" }, "material-theme-ui-lite/Light Owl Contrast.theme.json": { "name": "Material Theme UI Lite / Light Owl Contrast", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Light Owl Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Light Owl Contrast.theme.json" }, "material-theme-ui-lite/Material Darker.theme.json": { "name": "Material Theme UI Lite / Material Darker", @@ -353,7 +353,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Darker.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Material Darker.theme.json" }, "material-theme-ui-lite/Material Darker Contrast.theme.json": { "name": "Material Theme UI Lite / Material Darker Contrast", @@ -361,7 +361,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Darker Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Material Darker Contrast.theme.json" }, "material-theme-ui-lite/Material Deep Ocean.theme.json": { "name": "Material Theme UI Lite / Material Deep Ocean", @@ -369,7 +369,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Deep Ocean.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Material Deep Ocean.theme.json" }, "material-theme-ui-lite/Material Deep Ocean Contrast.theme.json": { "name": "Material Theme UI Lite / Material Deep Ocean Contrast", @@ -377,21 +377,21 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Deep Ocean Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Material Deep Ocean Contrast.theme.json" }, "material-theme-ui-lite/Material Lighter.theme.json": { "name": "Material Theme UI Lite / Material Lighter", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Lighter.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Material Lighter.theme.json" }, "material-theme-ui-lite/Material Lighter Contrast.theme.json": { "name": "Material Theme UI Lite / Material Lighter Contrast", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Lighter Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Material Lighter Contrast.theme.json" }, "material-theme-ui-lite/Material Oceanic.theme.json": { "name": "Material Theme UI Lite / Material Oceanic", @@ -399,7 +399,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Oceanic.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Material Oceanic.theme.json" }, "material-theme-ui-lite/Material Oceanic Contrast.theme.json": { "name": "Material Theme UI Lite / Material Oceanic Contrast", @@ -407,7 +407,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Oceanic Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Material Oceanic Contrast.theme.json" }, "material-theme-ui-lite/Material Palenight.theme.json": { "name": "Material Theme UI Lite / Material Palenight", @@ -415,7 +415,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Palenight.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Material Palenight.theme.json" }, "material-theme-ui-lite/Material Palenight Contrast.theme.json": { "name": "Material Theme UI Lite / Material Palenight Contrast", @@ -423,7 +423,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Material Palenight Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Material Palenight Contrast.theme.json" }, "material-theme-ui-lite/Monokai Pro.theme.json": { "name": "Material Theme UI Lite / Monokai Pro", @@ -431,7 +431,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Monokai Pro.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Monokai Pro.theme.json" }, "material-theme-ui-lite/Monokai Pro Contrast.theme.json": { "name": "Material Theme UI Lite / Monokai Pro Contrast", @@ -439,7 +439,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Monokai Pro Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Monokai Pro Contrast.theme.json" }, "material-theme-ui-lite/Moonlight.theme.json": { "name": "Material Theme UI Lite / Moonlight", @@ -447,7 +447,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Moonlight.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Moonlight.theme.json" }, "material-theme-ui-lite/Moonlight Contrast.theme.json": { "name": "Material Theme UI Lite / Moonlight Contrast", @@ -455,7 +455,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Moonlight Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Moonlight Contrast.theme.json" }, "material-theme-ui-lite/Night Owl.theme.json": { "name": "Material Theme UI Lite / Night Owl", @@ -463,7 +463,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Night Owl.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Night Owl.theme.json" }, "material-theme-ui-lite/Night Owl Contrast.theme.json": { "name": "Material Theme UI Lite / Night Owl Contrast", @@ -471,7 +471,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Night Owl Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Night Owl Contrast.theme.json" }, "material-theme-ui-lite/Solarized Dark.theme.json": { "name": "Material Theme UI Lite / Solarized Dark", @@ -479,7 +479,7 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Solarized Dark.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Solarized Dark.theme.json" }, "material-theme-ui-lite/Solarized Dark Contrast.theme.json": { "name": "Material Theme UI Lite / Solarized Dark Contrast", @@ -487,20 +487,20 @@ "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Solarized Dark Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Solarized Dark Contrast.theme.json" }, "material-theme-ui-lite/Solarized Light.theme.json": { "name": "Material Theme UI Lite / Solarized Light", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Solarized Light.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/regular/Solarized Light.theme.json" }, "material-theme-ui-lite/Solarized Light Contrast.theme.json": { "name": "Material Theme UI Lite / Solarized Light Contrast", "license": "MIT", "licenseFile": "material-theme-ui-lite/Material Theme UI Lite.LICENSE.txt", "sourceCodeUrl": "https://github.com/mallowigi/material-theme-ui-lite", - "sourceCodePath": "blob/master/src/main/resources/themes/Solarized Light Contrast.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/contrast/Solarized Light Contrast.theme.json" } } 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 1da5312d..9d9bde87 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 @@ -47,15 +47,15 @@ } }, "BookmarkMnemonicAssigned": { - "foreground": "primaryForeground", - "background": "#786299", + "buttonForeground": "primaryForeground", + "buttonBackground": "#786299", "borderColor": "secondaryAccentColor" }, "BookmarkMnemonicAvailable": { }, "BookmarkMnemonicCurrent": { - "foreground": "primaryForeground", - "background": "#8d6b81", + "buttonForeground": "primaryForeground", + "buttonBackground": "#8d6b81", "borderColor": "accentColor" }, "Button": { @@ -167,7 +167,7 @@ "foreground": "primaryForeground" }, "hoverBackground": "hoverBackground", - "lightSelectionBackground": "hoverBackground", + "lightSelectionBackground": "secondaryBackground", "Button": { "installBorderColor": "secondaryAccentColor", "installForeground": "secondaryAccentColor", @@ -228,9 +228,6 @@ "SidePanel": { "background": "secondaryBackground" }, - "StatusBar": { - "hoverBackground": "hoverBackground" - }, "TabbedPane": { "tabSelectionHeight": 1, "focusColor": "hoverBackground", @@ -240,7 +237,8 @@ }, "Table": { "gridColor": "#5d617a", - "hoverBackground": "selectionBackground" + "hoverBackground": "selectionBackground", + "lightSelectionBackground": "secondaryBackground" }, "TableHeader": { "bottomSeparatorColor": "separatorColor" @@ -312,8 +310,11 @@ "selectionBackground": "secondaryBackground", "selectionInactiveBackground": "secondaryBackground", "actions": { - "background": "hoverBackground" + "background": "secondaryBackground" } + }, + "Details": { + "background": "hoverBackground" } } }, diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json index 096e2d93..c579f01b 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/HiberbeeDark.theme.json @@ -2,189 +2,211 @@ "name": "Hiberbee Dark", "author": "Vlad Volkov", "dark": true, + "editorScheme": "/colors/Dark.icls", "icons": { "ColorPalette": { - "Actions.Blue": "#78dce8", - "Actions.Green": "#92d923", - "Actions.Grey": "#93918c", - "Actions.Red": "#fb3b45", - "Actions.Yellow": "#FFD866", - "Objects.Blue": "#78dce8", - "Objects.Green": "#92d923", + "Actions.GreyInline.Dark": "light4", + "Checkbox.Background.Disabled.Dark": "dark6", + "Checkbox.Background.Default.Dark": "dark8", + "Checkbox.Background.Selected.Dark": "dark8", + "Checkbox.Focus.Thin.Selected.Dark": "dark10", + "Checkbox.Focus.Wide.Dark": "dark10", + "Checkbox.Foreground.Selected.Dark": "accent", + "Checkbox.Border.Default.Dark": "dark9", + "Checkbox.Border.Disabled.Dark": "dark7", + "Checkbox.Border.Selected.Dark": "dark10", + "Tree.iconColor": "accent", + "Actions.Blue": "blue", + "Actions.Green": "green", + "Actions.Grey": "dark10", + "Actions.Red": "red", + "Actions.Yellow": "yellow", + "Objects.Blue": "blue", + "Objects.Green": "green", "Objects.Pink": "#ff6188", - "Objects.Purple": "#ab9df2", - "Objects.Red": "#fb3b45", - "Objects.RedStatus": "#fb3b45", - "Objects.Yellow": "#FFD866", - "Objects.YellowDark": "#FFB900" + "Objects.Purple": "#9380ff", + "Objects.Red": "#e81123", + "Objects.RedStatus": "#e81123", + "Objects.Grey": "#c9c8c7", + "Objects.Yellow": "#FFB900", + "Objects.YellowDark": "#ff8c00" } }, - "editorScheme": "/colors/Dark.xml", "colors": { - "black": "#000000", - "editorDarkerBg": "#2D2B29", - "shortcutForeground": "#2d2b29", - "editorBg": "#1B1A19", - "consoleBackground": "#171615", - "editorPaneBg": "#333231", - "panelBackground": "#333231", - "textColor": "#f9f6ef", - "textColorTransparent": "#f9f6ef7f", - "border": "#4d4c4b", - "redMac": "#fb3b45", - "redWin": "#ef6950", - "redMonokaiPro": "#ff6188", - "blueWinPalette": "#409AE1", - "blue": "#78dce8", - "deepBlue": "#3199b3", - "orangeMonokaiPro": "#fc9867", - "greenMonokaiPro": "#a9dc76", - "yellow": "#ffd64c", - "purpleWinPalette": "#b4a0ff", - "purpleMonokaiPro": "#ab9df2", - "greenWinPalette": "#40c5af", - "greyWinPalette": "#b2b2b2", - "panelText": "#acacac", - "desaturatedOrange": "#8049117f", - "green": "#92d923", - "greyDot15": "#f9f6ef", - "greyDot20": "#c0c0c0", - "greyDot25": "#bfbfbf", - "greyDot33": "#aaaaaa", - "greyDot50": "#7d7d7d", - "greyDot60": "#666666", - "greyDot65": "#5a5a5a", - "greyDot70": "#4d4c4b", - "greyDot75": "#434241", - "greyDot80": "#333231", - "greyDot85": "#2d2b29", - "greyDot90": "#1f1e1d", - "greyDot95": "#242220", - "greyDot100": "#181615", - "lightBlue": "#70D7FF", - "red": "#800040", - "transparentGreen": "#5B80217f", - "transparentRed": "#F250227f", - "transparentViolet": "#242221ff", - "transparentYellow": "#FFB9007a" + "dark1": "#070605", + "dark2": "#121110", + "dark3": "#171615", + "dark4": "#222120", + "dark5": "#272625", + "dark6": "#323130", + "dark7": "#373635", + "dark8": "#424140", + "dark9": "#474645", + "dark10": "#525150", + "accent": "#ffB900", + "green": "#92D923", + "greenDark": "#3d521b", + "blueDark": "#0078D7", + "blue": "#5EFBEF", + "red": "#e81123", + "redDark": "#8c131c", + "yellow": "#ffB900", + "yellowLight": "#ffc900", + "yellowDark": "#cc9300", + "light1": "#6f6e6d", + "light2": "#7f7e7d", + "light3": "#8f8e8d", + "light4": "#9f9e9d", + "light5": "#afaead", + "light6": "#bfbebd", + "light7": "#cfcecd", + "light8": "#dfdedd", + "light9": "#efeeed", + "light10": "#fffefd" }, "ui": { "*": { - "arc": 5, - "background": "panelBackground", - "borderColor": "border", - "caretForeground": "yellow", - "color": "greyDot60", - "foreground": "textColor", - "hoverBackground": "greyDot85", - "selectedBackground": "greyDot90", - "selectedForeground": "textColor", - "selectedInactiveBackground": "greyDot75", - "selectionBackground": "greyDot95", - "selectionForeground": "yellow", - "separatorColor": "border", - "underlineHeight": 1 + "arc": 0, + "selectedBackground": "dark4", + "selectionBackground": "dark3", + "selectionInactiveBackground": "dark4", + "selectedInactiveBackground": "dark5", + "hoverBackground": "dark4", + "headerBackground": "dark5", + "background": "dark6", + "disabledBackground": "dark7", + "inactiveBackground": "dark8", + "lineSeparatorColor": "dark9", + "separatorColor": "dark10", + "borderColor": "dark10", + "focusedBorderColor": "dark10", + "disabledForeground": "light1", + "disabledText": "light2", + "foreground": "light6", + "inactiveForeground": "light4", + "infoForeground": "light3", + "selectionForeground": "light10", + "shortcutForeground": "light7" }, "ActionButton": { - "pressedBackground": "greyDot95", - "hoverBorderColor": "greyDot65", - "pressedBorderColor": "greyDot60" - }, - "Borders": { - "ContrastBorderColor": "greyDot60", - "color": "border" + "pressedBackground": "dark3", + "hoverBorderColor": "dark10", + "pressedBorderColor": "dark10" }, "Button": { "default": { - "endBackground": "greyDot80", - "endBorderColor": "greyDot70", - "focusColor": "greyDot60", - "focusedBorderColor": "greyDot50", - "foreground": "greyDot33", - "startBackground": "greyDot80", - "startBorderColor": "greyDot70" + "endBackground": "dark8", + "endBorderColor": "dark9", + "focusColor": "dark10", + "focusedBorderColor": "dark10", + "foreground": "accent", + "startBackground": "dark8", + "startBorderColor": "dark9" }, - "shadowWidth": 1, - "endBackground": "greyDot80", - "endBorderColor": "greyDot70", - "focusedBorderColor": "greyDot50", - "foreground": "greyDot20", - "disabledBorderColor": "greyDot75", - "startBackground": "greyDot80", - "startBorderColor": "greyDot70" + "focusedBorderColor": "dark10", + "disabledText": "light2", + "endBackground": "dark8", + "endBorderColor": "dark9", + "foreground": "light8", + "disabledBorderColor": "dark8", + "startBackground": "dark8", + "startBorderColor": "dark9" + }, + "Borders": { + "ContrastBorderColor": "dark10", + "color": "dark9" + }, + "CheckBox": { + "select": "light10" + }, + "ColorChooser": { + "foreground": "light6", + "background": "dark6" }, - "CheckBox.disabledText": "greyDot50", - "CheckBox.foreground": "greyDot33", - "CheckBox.select": "greyDot50", - "CheckBoxMenuItem.background": "greyDot80", - "CheckBoxMenuItem.disabledBackground": "greyDot80", - "CheckBoxMenuItem.disabledForeground": "greyDot50", - "CheckBoxMenuItem.foreground": "greyDot20", - "ColorChooser.background": "greyDot80", "ComboBox": { "ArrowButton": { - "disabledIconColor": "textColorTransparent", + "disabledIconColor": "light2", "iconColor": "yellow", - "nonEditableBackground": "greyDot65" + "background": "dark7", + "nonEditableBackground": "dark7" }, - "background": "greyDot80", - "disabledForeground": "greyDot50", - "foreground": "greyDot20", + "background": "dark8", + "disabledForeground": "light2", "modifiedItemForeground": "yellow", - "nonEditableBackground": "greyDot75", - "selectionBackground": "greyDot95" + "nonEditableBackground": "dark8" }, "CompletionPopup": { - "foreground": "greyDot20", - "matchForeground": "yellow", - "selectionBackground": "greyDot95", - "selectionInactiveBackground": "greyDot85" + "Advertiser": { + "background": "dark5", + "foreground": "light5" + }, + "foreground": "light6", + "matchForeground": "accent" + }, + "ComplexPopup": { + "Header": { + "background": "dark5" + } }, "Component": { - "iconColor": "yellow", - "disabledBorderColor": "greyDot75", - "infoForeground": "greyDot50", + "arc": 0, + "disabledBorderColor": "dark8", + "borderColor": "dark9", "errorFocusColor": "red", - "focusColor": "greyDot60", - "focusWidth": 0, - "focusedBorderColor": "greyDot65", - "inactiveErrorFocusColor": "transparentRed", - "inactiveWarningFocusColor": "transparentYellow", + "focusColor": "dark10", + "focusedBorderColor": "dark10", + "inactiveErrorFocusColor": "redDark", + "inactiveWarningFocusColor": "yellowDark", + "infoForeground": "light3", "warningFocusColor": "yellow" }, - "Debugger.Variables.changedValueForeground": "yellow", - "Debugger.Variables.evaluatingExpressionForeground": "lightBlue", - "DefaultTabs.borderColor": "border", - "DefaultTabs.inactiveUnderlineColor": "border", - "DefaultTabs.underlineColor": "yellow", - "DefaultTabs.underlineHeight": 1, - "DefaultTabs.underlinedTabForeground": "yellow", - "DragAndDrop.areaBackground": "greyDot75", - "DragAndDrop.areaForeground": "greyDot25", + "Counter": { + "background": "dark3", + "foreground": "yellow" + }, + "Debugger": { + "Variables": { + "changedValueForeground": "yellow", + "typeForeground": "blue", + "valueForeground": "light10", + "exceptionForeground": "red", + "evaluatingExpressionForeground": "green" + }, + "EvaluateExpression.background": "dark8" + }, + "DebuggerTabs": { + "underlineHeight": 1 + }, + "DefaultTabs": { + "underlineHeight": 1, + "background": "dark6", + "inactiveUnderlineColor": "yellowDark", + "underlineColor": "accent", + "underlinedTabBackground": "dark4" + }, + "DragAndDrop": { + "areaBackground": "dark8", + "areaForeground": "light4" + }, "Editor": { - "background": "editorPaneBg", - "foreground": "textColor", - "shortcutForeground": "greyDot20" + "SearchField": { + "background": "dark8" + }, + "Toolbar.borderColor": "dark8", + "background": "dark4", + "shortcutForeground": "light5" }, "EditorPane": { - "background": "editorPaneBg", - "inactiveBackground": "editorDarkerBg", - "inactiveForeground": "greyDot50", - "selectionBackground": "editorBg", - "selectionForeground": "textColor" + "inactiveBackground": "dark7", + "inactiveForeground": "light3", + "splitBorder": "dark8", + "background": "dark5" }, "EditorTabs": { - "underlineHeight": 1, - "hoverBackground": "greyDot95", - "borderColor": "border", - "background": "editorPaneBg", - "inactiveColoredFileBackground": "editorPaneBg", - "inactiveUnderlineColor": "editorPaneBg", - "underlinedTabBackground": "editorPaneBg", - "underlinedTabForeground": "yellow" + "underlineHeight": 1 }, "FileColor": { - "Gray": "greyDot70", + "Gray": "dark5", "Blue": "#23282d", "Green": "#232d28", "Orange": "#2d2823", @@ -193,193 +215,358 @@ "Yellow": "#3b3b19" }, "FormattedTextField": { + "background": "dark8", "caretForeground": "yellow", - "foreground": "textColor", - "selectionBackground": "greyDot95", - "inactiveBackground": "greyDot80", - "inactiveForeground": "greyDot33", - "background": "greyDot75" + "foreground": "light6", + "inactiveBackground": "dark7", + "selectionForeground": "yellow" }, "GutterTooltip": { - "infoForeground": "greyDot33", - "lineSeparatorColor": "greyDot70" + "lineSeparatorColor": "dark9", + "infoForeground": "light3" + }, + "IconBadge": { + "errorBackground": "red", + "infoBackground": "blue", + "successBackground": "green", + "warningBackground": "yellow" }, "InformationHint": { - "borderColor": "border" + "borderColor": "green" + }, + "InplaceRefactoringPopup": { + "borderColor": "yellow" }, - "InplaceRefactoringPopup.borderColor": "border", "Label": { - "disabledForeground": "greyDot33", - "disabledText": "greyDot33", - "foreground": "greyDot20", - "infoForeground": "greyDot50" + "errorForeground": "red", + "successForeground": "green", + "selectedForeground": "yellow", + "foreground": "light6", + "background": "dark7", + "infoForeground": "light3" }, "Link": { - "activeForeground": "blue", - "hoverForeground": "yellow", - "secondaryForeground": "lightBlue", - "visitedForeground": "purpleMonokaiPro", - "pressedForeground": "deepBlue" + "activeForeground": "accent", + "hoverForeground": "light10", + "secondaryForeground": "blue", + "visitedForeground": "blueDark", + "pressedForeground": "yellowDark" + }, + "List": { + "Tag": { + "background": "dark7", + "foreground": "light6" + }, + "background": "dark7", + "hoverInactiveBackground": "dark5", + "hoverBackground": "dark4", + "selectionBackground": "dark4", + "selectionInactiveBackground": "dark5" + }, + "MemoryIndicator": { + "allocatedBackground": "dark10", + "usedBackground": "redDark" }, - "Link.hoverForeground": "yellow", - "MemoryIndicator.allocatedBackground": "green", - "MemoryIndicator.usedBackground": "red", "Menu": { - "background": "greyDot80", - "disabledForeground": "greyDot70", - "separatorColor": "greyDot75", - "foreground": "textColor", - "borderColor": "greyDot70", - "acceleratorForeground": "greyDot33" + "Selection.arc": 0, + "borderColor": "dark9", + "disabledBackground": "dark8", + "acceleratorSelectionForeground": "light10", + "acceleratorForeground": "light10" }, - "Notification.MoreButton.innerBorderColor": "greyDot65", - "Notification.ToolWindow.errorBackground": "greyDot95", - "Notification.ToolWindow.errorBorderColor": "red", - "Notification.ToolWindow.errorForeground": "#EE7762", - "Notification.ToolWindow.informativeBackground": "editorPaneBg", - "Notification.ToolWindow.informativeBorderColor": "border", - "Notification.ToolWindow.informativeForeground": "textColor", - "Notification.ToolWindow.warningBackground": "greyDot95", - "Notification.ToolWindow.warningBorderColor": "yellow", - "Notification.ToolWindow.warningForeground": "yellow", - "Notification.background": "editorPaneBg", - "Notification.borderColor": "border", - "Notification.errorBackground": "greyDot95", - "Notification.errorBorderColor": "red", - "Notification.errorForeground": "#EE7762", - "Notification.foreground": "textColor", - "NotificationsToolwindow.newNotification.background": "editorPaneBg", - "NotificationsToolwindow.newNotification.hoverBackground": "greyDot95", - "OptionPane": { - "background": "editorPaneBg", - "foreground": "greyDot20" + "Notification": { + "arc": 0, + "ToolWindow": { + "errorBackground": "dark4", + "errorBorderColor": "red", + "errorForeground": "light10", + "informativeBackground": "dark4", + "informativeBorderColor": "green", + "informativeForeground": "light10", + "warningBackground": "dark4", + "warningBorderColor": "yellow", + "warningForeground": "light10" + }, + "background": "dark4", + "borderColor": "dark9", + "errorBackground": "dark4", + "errorBorderColor": "red", + "errorForeground": "light10", + "foreground": "light10" + }, + "NotificationsToolwindow": { + "newNotification.background": "dark4", + "newNotification.hoverBackground": "dark3" }, "Panel": { - "background": "editorPaneBg", - "foreground": "textColor" + "background": "dark6", + "foreground": "light6" }, - "ParameterInfo.background": "greyDot85", - "ParameterInfo.borderColor": "greyDot75", - "ParameterInfo.currentOverloadBackground": "greyDot65", - "ParameterInfo.currentParameterForeground": "yellow", - "ParameterInfo.foreground": "greyDot25", - "ParameterInfo.infoForeground": "greyDot33", - "ParameterInfo.lineSeparatorColor": "greyDot75", - "PasswordField.background": "greyDot75", - "Plugins.Button.installBackground": "greyDot80", - "Plugins.Button.installBorderColor": "greyDot60", - "Plugins.Button.installFillBackground": "greyDot80", - "Plugins.Button.installFillForeground": "greyDot25", - "Plugins.Button.installForeground": "yellow", - "Plugins.SearchField.background": "greyDot75", - "Plugins.SectionHeader.background": "greyDot75", - "Plugins.Tab.hoverBackground": "editorBg", - "Plugins.Tab.selectedBackground": "editorPaneBg", - "Plugins.background": "editorPaneBg", - "Plugins.disabledForeground": "greyDot50", - "Plugins.hoverBackground": "editorBg", - "Plugins.lightSelectionBackground": "#242220", - "Plugins.tagBackground": "editorBg", - "Plugins.tagForeground": "greyDot33", - "Popup.Advertiser.background": "greyDot85", - "Popup.Advertiser.foreground": "greyDot50", - "Popup.Header.activeBackground": "greyDot75", - "Popup.Header.inactiveBackground": "greyDot85", - "Popup.paintBorder": false, - "PopupMenu.background": "greyDot80", - "PopupMenuSeparator.stripeWidth": 1, - "ProgressBar.failedColor": "red", - "ProgressBar.failedEndColor": "greyDot75", - "ProgressBar.indeterminateEndColor": "#FD971F", - "ProgressBar.indeterminateStartColor": "yellow", - "ProgressBar.passedColor": "green", - "ProgressBar.passedEndColor": "greyDot75", - "ProgressBar.progressColor": "yellow", - "ProgressBar.trackColor": "greyDot75", - "RadioButton.background": "greyDot80", - "RadioButton.disabledText": "greyDot70", - "RadioButtonMenuItem.disabledBackground": "greyDot80", - "ScrollPane.background": "greyDot80", - "SearchEverywhere.Advertiser.foreground": "greyDot50", - "SearchEverywhere.Header.background": "greyDot80", - "SearchEverywhere.List.separatorForeground": "greyDot50", - "SearchEverywhere.SearchField.background": "greyDot75", - "SearchEverywhere.SearchField.infoForeground": "greyDot33", - "SearchEverywhere.Tab.selectedBackground": "greyDot95", - "SearchEverywhere.Tab.selectedForeground": "yellow", - "SearchMatch.endBackground": "yellow", - "SearchMatch.startBackground": "yellow", - "SidePanel.background": "greyDot85", - "SpeedSearch.errorForeground": "red", - "SpeedSearch.foreground": "yellow", - "SplitPane.highlight": "yellow", - "TabbedPane.disabledUnderlineColor": "editorPaneBg", - "TabbedPane.focus": "greyDot75", - "TabbedPane.focusColor": "greyDot33", - "TabbedPane.tabSelectionHeight": 1, - "TabbedPane.underlineColor": "yellow", - "Table.dropLineColor": "greyDot75", - "Table.dropLineShortColor": "greyDot70", - "Table.focusCellBackground": "greyDot85", - "Table.focusCellForeground": "yellow", - "Table.sortIconColor": "yellow", - "Table.stripeColor": "greyDot75", - "TableHeader.background": "greyDot85", - "TableHeader.bottomSeparatorColor": "greyDot65", - "TextArea.background": "greyDot75", - "TextArea.caretForeground": "yellow", - "TextArea.inactiveBackground": "greyDot80", - "TextArea.selectionBackground": "greyDot95", - "TextField.background": "greyDot75", - "TextField.caretForeground": "yellow", - "TextField.foreground": "greyDot33", - "TextField.highlight": "yellow", - "TextField.inactiveForeground": "greyDot33", - "TextPane.inactiveBackground": "greyDot80", - "TextPane.inactiveForeground": "greyDot50", - "TitlePane.background": "greyDot85", - "ToggleButton.buttonColor": "greyDot65", - "ToggleButton.offBackground": "greyDot75", - "ToggleButton.offForeground": "greyDot25", - "ToggleButton.onBackground": "yellow", - "ToggleButton.onForeground": "greyDot80", - "ToolBar.borderHandleColor": "greyDot65", - "ToolTip.Actions.background": "greyDot80", - "ToolTip.Actions.infoForeground": "greyDot50", - "ToolTip.background": "greyDot80", - "ToolTip.borderColor": "border", - "ToolTip.infoForeground": "greyDot50", - "ToolWindow.Button.hoverBackground": "greyDot95", - "ToolWindow.Button.selectedBackground": "greyDot95", - "ToolWindow.Button.selectedForeground": "yellow", - "ToolWindow.Header.background": "greyDot85", - "ToolWindow.Header.inactiveBackground": "editorPaneBg", - "ToolWindow.HeaderTab.hoverBackground": "consoleBackground", - "ToolWindow.HeaderTab.hoverInactiveBackground": "editorBg", - "ToolWindow.HeaderTab.underlineColor": "yellow", - "ToolWindow.HeaderTab.underlineHeight": 1, - "Tooltip.separatorColor": "border", - "Tree.background": "greyDot85", - "Tree.foreground": "textColor", - "Tree.hoverBackground": "greyDot95", - "Tree.modifiedItemForeground": "yellow", - "Tree.selectionBackground": "greyDot95", - "Tree.selectionInactiveBackground": "greyDot95", - "ValidationTooltip.errorBackground": "greyDot95", - "ValidationTooltip.errorBorderColor": "red", - "ValidationTooltip.warningBackground": "greyDot95", - "ValidationTooltip.warningBorderColor": "yellow", - "VersionControl.FileHistory.Commit.selectedBranchBackground": "greyDot95", - "VersionControl.Log.Commit.currentBranchBackground": "greyDot85", - "VersionControl.Log.Commit.hoveredBackground": "greyDot95", - "VersionControl.Log.Commit.unmatchedForeground": "greyDot25", - "WelcomeScreen.Details.background": "greyDot80", - "WelcomeScreen.Projects.background": "greyDot85", - "WelcomeScreen.Projects.selectionBackground": "greyDot95", - "WelcomeScreen.SidePanel.background": "greyDot80", - "WelcomeScreen.background": "greyDot80", - "WelcomeScreen.borderColor": "border", - "WelcomeScreen.separatorColor": "border", - "Window.border": "0,0,0,0,4d4d4d" + "ParameterInfo": { + "background": "dark5", + "currentOverloadBackground": "yellow", + "currentParameterForeground": "blue", + "foreground": "light6", + "infoForeground": "light2", + "lineSeparatorColor": "dark9" + }, + "PasswordField": { + "capsLockIconColor": "red", + "background": "dark8" + }, + "Plugins": { + "Button": { + "installBackground": "dark8", + "installBorderColor": "dark9", + "installFillBackground": "dark8", + "installFillForeground": "light6", + "installFocusedBackground": "dark5", + "installForeground": "light10" + }, + "SearchField": { + "background": "dark8" + }, + "SectionHeader": { + "background": "dark5", + "foreground": "light5" + }, + "hoverBackground": "dark4", + "background": "dark7", + "lightSelectionBackground": "dark5", + "tagBackground": "dark8", + "tagForeground": "light10" + }, + "Popup": { + "Advertiser": { + "background": "dark4", + "borderColor": "dark8", + "foreground": "light3" + }, + "Header": { + "activeBackground": "dark4", + "activeForeground": "light4", + "inactiveBackground": "dark5" + }, + "Selection": { + "arc": 0 + } + }, + "PopupMenu": { + "Selection": { + "arc": 0 + }, + "background": "dark6", + "foreground": "light6" + }, + "ProgressBar": { + "failedColor": "red", + "failedEndColor": "dark6", + "indeterminateEndColor": "yellowDark", + "indeterminateStartColor": "yellow", + "passedColor": "green", + "passedEndColor": "dark6", + "progressColor": "yellow", + "trackColor": "dark6" + }, + "RadioButtonMenuItem": { + "background": "dark9", + "foreground": "light6", + "acceleratorForeground": "blueDark", + "selectionForeground": "yellow" + }, + "RunWidget": { + "background": "dark6", + "pressedBackground": "dark3", + "runningBackground": "dark5" + }, + "ScrollBar": { + "hoverThumbColor": "dark10" + }, + "SearchEverywhere": { + "Advertiser": { + "background": "dark4", + "foreground": "light3" + }, + "Header": { + "background": "dark5" + }, + "List": { + "separatorForeground": "dark9", + "settingsBackground": "dark5" + }, + "SearchField": { + "background": "dark9", + "borderColor": "dark9", + "infoForeground": "light2" + }, + "Tab": { + "selectedBackground": "dark2", + "selectedForeground": "yellow" + } + }, + "SearchMatch": { + "endBackground": "yellow", + "startBackground": "yellow" + }, + "SegmentedButton": { + "focusedSelectedButtonColor": "dark3", + "selectedButtonColor": "dark4", + "selectedStartBorderColor": "dark9", + "selectedEndBorderColor": "dark9" + }, + "Separator": { + "separatorColor": "dark9" + }, + "SidePanel": { + "background": "dark5" + }, + "SpeedSearch": { + "borderColor": "dark9", + "errorForeground": "red", + "foreground": "yellow" + }, + "SplitPane": { + "background": "dark5", + "highlight": "yellow" + }, + "TabbedPane": { + "contentAreaColor": "dark7", + "disabledForeground": "light2", + "disabledUnderlineColor": "light2", + "focusColor": "dark4", + "focus": "dark9", + "tabSelectionArc": 0, + "underlineColor": "accent" + }, + "Table": { + "background": "dark7", + "alternativeRowBackground": "dark5", + "dropLineColor": "dark10", + "dropLineShortColor": "dark10", + "focusCellBackground": "dark4", + "focusCellForeground": "yellow", + "lightSelectionBackground": "dark4", + "gridColor": "dark9", + "sortIconColor": "yellow", + "stripeColor": "dark9" + }, + "TableHeader": { + "background": "dark4", + "bottomSeparatorColor": "dark9" + }, + "TextArea": { + "background": "dark8", + "foreground": "light6", + "inactiveBackground": "dark7", + "inactiveForeground": "light2" + }, + "TextField": { + "background": "dark8", + "caretForeground": "yellow", + "foreground": "light6", + "highlight": "yellow", + "inactiveForeground": "light2", + "selectionBackground": "dark4", + "selectionForeground": "yellow" + }, + "TextPane": { + "background": "dark6", + "inactiveBackground": "dark7", + "inactiveForeground": "light2", + "selectionBackground": "dark4" + }, + "TitlePane": { + "background": "dark5" + }, + "ToggleButton": { + "buttonColor": "dark9", + "disabledText": "light2", + "offBackground": "dark4", + "offForeground": "light6", + "onBackground": "yellow", + "onForeground": "dark1" + }, + "ToolBar": { + "borderHandleColor": "dark9" + }, + "ToolTip": { + "Actions.background": "dark5", + "Actions.infoForeground": "light3", + "background": "dark5", + "paintBorder": true, + "infoForeground": "light2" + }, + "ToolWindow": { + "Button": { + "selectedBackground": "dark4", + "selectedForeground": "yellow" + }, + "Header": { + "background": "dark4", + "inactiveBackground": "dark5" + }, + "HeaderTab": { + "underlineHeight": 1, + "hoverInactiveBackground": "dark5", + "inactiveUnderlineColor": "yellowDark", + "underlinedTabInactiveBackground": "dark3", + "underlinedTabBackground": "dark2", + "underlineColor": "yellow" + }, + "background": "dark7" + }, + "Tree": { + "background": "dark7", + "foreground": "light6", + "hash": "dark9", + "hoverInactiveBackground": "dark5", + "modifiedItemForeground": "yellow", + "selectionInactiveBackground": "dark5" + }, + "ScrollPane": { + "background": "dark7", + "foreground": "light6" + }, + "ValidationTooltip": { + "errorBackground": "dark4", + "errorBorderColor": "red", + "warningBackground": "dark4", + "warningBorderColor": "yellow" + }, + "VersionControl": { + "MarkerPopup.Toolbar.background": "dark4", + "FileHistory": { + "Commit.selectedBranchBackground": "dark7" + }, + "Log": { + "Commit": { + "currentBranchBackground": "dark7", + "unmatchedForeground": "light2", + "selectionForeground": "light10", + "selectionInactiveBackground": "dark9", + "hoveredBackground": "dark3", + "selectionBackground": "dark4" + } + } + }, + "Viewport": { + "background": "dark7", + "foreground": "light7" + }, + "WelcomeScreen": { + "Details": { + "background": "dark7" + }, + "Projects": { + "background": "dark6", + "selectionBackground": "dark55", + "selectionInactiveBackground": "dark5" + }, + "SidePanel": { + "background": "dark5" + }, + "background": "dark6", + "separatorColor": "dark9" + },"Window.border": "0,0,0,0,525150" } } diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json index 48ac545f..f23abea2 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Spacegray.theme.json @@ -68,8 +68,7 @@ "ComboPopup.border": "1,1,1,1,64647A", "CompletionPopup": { "matchForeground": "#BF616A", - "selectionBackground": "#5a6173", - "selectionInactiveBackground": "#383C4A" + "selectionBackground": "#383C4A" }, "Component": { "errorFocusColor": "#bf4c53", 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 83c0ffc6..423144e2 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 @@ -22,7 +22,7 @@ "cs": "#262b33", "button": "#383C4A", "table": "#41416A", - "tree": "#09477170", + "tree": "#0f3d56", "hl": "#444A58", "notif": "#262a33", "hc": "#262b33", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#5294E2", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 6426719f..8aa2b207 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 @@ -22,7 +22,7 @@ "cs": "#262b33", "button": "#383C4A", "table": "#41416A", - "tree": "#09477170", + "tree": "#0f3d56", "hl": "#444A58", "notif": "#262a33", "hc": "#2f343f", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#5294E2", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 014cfe41..060f891d 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 @@ -22,7 +22,7 @@ "cs": "#21252B", "button": "#3A3F4B", "table": "#383E49", - "tree": "#3A3F4B80", + "tree": "#303540", "hl": "#383D48", "notif": "#282C34", "hc": "#21252B", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2979ff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 f35454c8..6993b7e2 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 @@ -22,7 +22,7 @@ "cs": "#21252B", "button": "#3A3F4B", "table": "#383E49", - "tree": "#3A3F4B80", + "tree": "#303540", "hl": "#383D48", "notif": "#282C34", "hc": "#282C34", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2979ff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 3b324aa4..e5689794 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 @@ -22,7 +22,7 @@ "cs": "#eaeaeb", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#DBDBDC80", + "tree": "#e8e8e8", "hl": "#FFFFFF", "notif": "#F2F2F2", "hc": "#eaeaeb", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2979ff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 a45660ed..66fff94e 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 @@ -22,7 +22,7 @@ "cs": "#eaeaeb", "button": "#DBDBDC", "table": "#DBDBDC", - "tree": "#DBDBDC80", + "tree": "#e8e8e8", "hl": "#FFFFFF", "notif": "#F2F2F2", "hc": "#F4F4F4", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2979ff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 9f35db5c..827170cd 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 @@ -22,7 +22,7 @@ "cs": "#191A21", "button": "#393C4B", "table": "#44475A", - "tree": "#44475A50", + "tree": "#2f3342", "hl": "#44475a", "notif": "#1D2228", "hc": "#191A21", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#FF79C5", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 4c183acd..070971f5 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 @@ -22,7 +22,7 @@ "cs": "#191A21", "button": "#393C4B", "table": "#44475A", - "tree": "#44475A50", + "tree": "#2f3342", "hl": "#44475a", "notif": "#1D2228", "hc": "#282A36", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#FF79C5", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 da91495e..4eb32ca8 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 @@ -22,7 +22,7 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e87c", + "tree": "#ebedf0", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#fafbfc", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#79CB60", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 37bbc6c8..1f92c311 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 @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#f9826c", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 9543c2ac..be7c0cdf 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 @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#f9826c", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 60609f5a..21060cc9 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 @@ -22,7 +22,7 @@ "cs": "#fafbfc", "button": "#edf1f5", "table": "#cce5ff", - "tree": "#e1e4e87c", + "tree": "#ebedf0", "hl": "#CCE5FF", "notif": "#DFECFE", "hc": "#F7F8FA", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#79CB60", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 28028cf6..aa25d60c 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 @@ -22,7 +22,7 @@ "cs": "#f0f0f0", "button": "#d9d9d9", "table": "#d3e8f8", - "tree": "#d3e8f87c", + "tree": "#dfebf4", "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#f0f0f0", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2AA298", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 81cb3570..f5a52d36 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 @@ -22,7 +22,7 @@ "cs": "#f0f0f0", "button": "#d9d9d9", "table": "#d3e8f8", - "tree": "#d3e8f87c", + "tree": "#dfebf4", "hl": "#CCCCCC", "notif": "#F0F0F0", "hc": "#F0F0F0", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#2AA298", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json index 7bacba07..84f4026d 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker Contrast.theme.json @@ -22,7 +22,7 @@ "cs": "#1A1A1A", "button": "#2A2A2A", "table": "#323232", - "tree": "#323232C0", + "tree": "#2d2d2d", "hl": "#3F3F3F", "notif": "#1A1A1A", "hc": "#1A1A1A", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#FF9800", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json index 1932150d..d3abe59c 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Darker.theme.json @@ -22,7 +22,7 @@ "cs": "#1A1A1A", "button": "#2A2A2A", "table": "#323232", - "tree": "#323232C0", + "tree": "#2d2d2d", "hl": "#3F3F3F", "notif": "#1A1A1A", "hc": "#212121", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#FF9800", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json index 3f9104d7..68950a24 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean Contrast.theme.json @@ -22,7 +22,7 @@ "cs": "#090B10", "button": "#191A21", "table": "#1A1C25", - "tree": "#717CB430", + "tree": "#212639", "hl": "#1F2233", "notif": "#090B10", "hc": "#090B10", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#84ffff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json index 600f19c8..ffd58616 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Deep Ocean.theme.json @@ -22,7 +22,7 @@ "cs": "#090B10", "button": "#191A21", "table": "#1A1C25", - "tree": "#717CB430", + "tree": "#212639", "hl": "#1F2233", "notif": "#090B10", "hc": "#0F111A", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#84ffff", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json index 4e385006..5c45a739 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter Contrast.theme.json @@ -22,7 +22,7 @@ "cs": "#EEEEEE", "button": "#F3F4F5", "table": "#E7E7E8", - "tree": "#80CBC440", + "tree": "#d7eeec", "hl": "#E7E7E8", "notif": "#eae8e8", "hc": "#EEEEEE", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#00BCD4", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json index 505c7419..f5954209 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Lighter.theme.json @@ -22,7 +22,7 @@ "cs": "#EEEEEE", "button": "#F3F4F5", "table": "#E7E7E8", - "tree": "#80CBC440", + "tree": "#d7eeec", "hl": "#E7E7E8", "notif": "#eae8e8", "hc": "#FAFAFA", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#00BCD4", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json index 5c1a58ad..d128ab60 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic Contrast.theme.json @@ -22,7 +22,7 @@ "cs": "#1E272C", "button": "#2E3C43", "table": "#314549", - "tree": "#546E7A70", + "tree": "#30454d", "hl": "#425B67", "notif": "#1E272C", "hc": "#1E272C", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#009688", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json index b1a59482..0dfe4095 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Oceanic.theme.json @@ -22,7 +22,7 @@ "cs": "#1E272C", "button": "#2E3C43", "table": "#314549", - "tree": "#546E7A70", + "tree": "#30454d", "hl": "#425B67", "notif": "#1E272C", "hc": "#263238", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#009688", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json index 76868a45..41f9bea8 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight Contrast.theme.json @@ -11,7 +11,7 @@ "selBg20": "#44426720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", - "border": "#2b2a3e", + "border": "#323147", "excl": "#2f2e43", "second": "#34324a", "dis": "#515772", @@ -22,7 +22,7 @@ "cs": "#202331", "button": "#303348", "table": "#414863", - "tree": "#676E95", + "tree": "#3b415b", "hl": "#444267", "notif": "#202331", "hc": "#202331", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#ab47bc", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json index e0a75463..a000ee12 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/material-theme-ui-lite/Material Palenight.theme.json @@ -11,7 +11,7 @@ "selBg20": "#44426720", "selFg": "#FFFFFF", "activeFg": "#FFFFFF", - "border": "#2b2a3e", + "border": "#323147", "excl": "#2f2e43", "second": "#34324a", "dis": "#515772", @@ -22,7 +22,7 @@ "cs": "#202331", "button": "#303348", "table": "#414863", - "tree": "#676E95", + "tree": "#3b415b", "hl": "#444267", "notif": "#202331", "hc": "#292D3E", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#ab47bc", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 0451fd21..276d5c7c 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 @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#ffd866", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 f65f73a8..de4f8a8c 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 @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#ffd866", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 916274f8..a8bb7926 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 @@ -22,7 +22,7 @@ "cs": "#191a2a", "button": "#444a73", "table": "#2f334d", - "tree": "#444a7370", + "tree": "#2f3452", "hl": "#444a73", "notif": "#191a2a", "hc": "#191a2a", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#74a0f1", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 de86d687..7c3020e0 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 @@ -22,7 +22,7 @@ "cs": "#191a2a", "button": "#444a73", "table": "#2f334d", - "tree": "#444a7370", + "tree": "#2f3452", "hl": "#444a73", "notif": "#191a2a", "hc": "#222436", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#74a0f1", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 933d62ea..5cdbc5cf 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 @@ -22,7 +22,7 @@ "cs": "#010e1a", "button": "#0b253a", "table": "#13344f", - "tree": "#13344f50", + "tree": "#13344f", "hl": "#084d81", "notif": "#01111d", "hc": "#010e1a", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#7e57c2", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 80252676..bb64595f 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 @@ -22,7 +22,7 @@ "cs": "#010e1a", "button": "#0b253a", "table": "#13344f", - "tree": "#13344f50", + "tree": "#13344f", "hl": "#084d81", "notif": "#01111d", "hc": "#011627", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#7e57c2", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 6826fbe0..6932b7a3 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 @@ -22,7 +22,7 @@ "cs": "#00252E", "button": "#073642", "table": "#003946", - "tree": "#2E4C5280", + "tree": "#023c45", "hl": "#005a6f", "notif": "#2E4C52", "hc": "#00252E", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#d33682", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 58eec1ab..05bdde3c 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 @@ -22,7 +22,7 @@ "cs": "#00252E", "button": "#073642", "table": "#003946", - "tree": "#2E4C5280", + "tree": "#023c45", "hl": "#005a6f", "notif": "#2E4C52", "hc": "#002B36", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#d33682", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 efa15762..79a1b06a 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 @@ -22,7 +22,7 @@ "cs": "#eee8d5", "button": "#d8d4c4", "table": "#d1cbb8", - "tree": "#e8dcb6b0", + "tree": "#f0e4bf", "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#eee8d5", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#d33682", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 21ed9eeb..400cc37e 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 @@ -22,7 +22,7 @@ "cs": "#eee8d5", "button": "#d8d4c4", "table": "#d1cbb8", - "tree": "#e8dcb6b0", + "tree": "#f0e4bf", "hl": "#d1cbb8", "notif": "#EDE8D4", "hc": "#fdf6e3", @@ -73,6 +73,10 @@ "pressedBackground": "accent50", "pressedBorderColor": "accent50" }, + "ActionsList": { + "icon.gap": 12, + "mnemonic.icon.gap": 12 + }, "ActionToolbar": { "background": "hc" }, @@ -127,8 +131,9 @@ "BookmarkIcon.background": "accent", "Borders.ContrastBorderColor": "bg", "Borders.color": "border", + "Breakpoint.iconHoverAlpha": 0.35, "Button": { - "arc": 0, + "arc": 8, "background": "bg", "darcula": { "borderColor": "button", @@ -181,7 +186,10 @@ "shadowColor": "shadow", "shadowWidth": 0, "startBackground": "table", - "startBorderColor": "button" + "startBorderColor": "button", + "ToolWindow": { + "arc": 40 + } }, "Canvas": { "Tooltip.background": "notif", @@ -256,6 +264,32 @@ "accessDot": "accent", "dropdownBorder": "second", "pillBackground": "second" + }, + "Users": { + "1": { + "Background": "green", + "Foreground": "fg" + }, + "2": { + "Background": "blue", + "Foreground": "fg" + }, + "3": { + "Background": "red", + "Foreground": "fg" + }, + "4": { + "Background": "purple", + "Foreground": "fg" + }, + "5": { + "Background": "yellow", + "Foreground": "fg" + }, + "6": { + "Background": "orange", + "Foreground": "fg" + } } }, "ColorChooser": { @@ -293,7 +327,13 @@ "selectionBackground": "table", "selectionForeground": "activeFg" }, + "ComboPopup.border": "1,1,1,1,#d33682", "CompletionPopup": { + "Advertiser": { + "background": "bg", + "foreground": "fg", + "borderInsets": "8,12,8,12" + }, "background": "second", "foreground": "fg", "grayForeground": "text", @@ -313,8 +353,12 @@ "selectionInactiveInfoForeground": "text", "selectionInfoForeground": "selFg" }, + "ComplexPopup": { + "Header.background": "notif" + }, "Component": { "arc": 4, + "focusWidth": 2, "borderColor": "hl", "disabledBorderColor": "dis", "focusColor": "accent", @@ -351,6 +395,7 @@ }, "desktop": "hc", "Debugger": { + "EvaluateExpression.background": "bg", "Variables": { "changedValueForeground": "accent", "collectingDataForeground": "text", @@ -358,13 +403,15 @@ "evaluatingExpressionForeground": "text", "exceptionForeground": "yellow", "modifyingValueForeground": "accent", - "valueForeground": "accent" + "valueForeground": "accent", + "typeForeground": "text" } }, "DebuggerTabs": { "active.background": "hl", "selectedBackground": "hl", - "underlinedTabBackground": "table" + "underlinedTabBackground": "table", + "underlineHeight": 2 }, "DebuggerPopup": { "borderColor": "bg" @@ -380,6 +427,7 @@ "inactiveMaskColor": "hc", "inactiveUnderlineColor": "accent", "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -398,13 +446,21 @@ "backgroundBorderColor": "bg", "backgroundColor": "bg", "borderColor": "accent", - "foregroundColor": "fg" + "foregroundColor": "fg", + "rowBackground": "accent70" }, "dropArea.base": "accent", "Editor": { "background": "hc", "foreground": "fg", - "shortcutForeground": "text" + "shortcutForeground": "text", + "SearchField": { + "background": "cs", + "borderInsets": "8,12,8,12" + }, + "Toolbar": { + "borderColor": "border" + } }, "EditorGroupsTabs": { "background": "bg", @@ -423,7 +479,8 @@ "inactiveBackground": "bg", "inactiveForeground": "dis", "selectionBackground": "selBg", - "selectionForeground": "activeFg" + "selectionForeground": "activeFg", + "splitBorder": "border" }, "EditorTabs": { "active.background": "table", @@ -441,7 +498,10 @@ "inactiveUnderlineColor": "dis", "selectedBackground": "table", "selectedForeground": "fg", + "tabInsets": "-10,10,-10,10", "underlineColor": "accent", + "underlineHeight": 3, + "underlineArc": 4, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg" }, @@ -472,7 +532,7 @@ "defaultButtonBorderColor": "accent" }, "FormattedTextField": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveBackground": "button", @@ -509,6 +569,9 @@ "disabledSeparatorColor": "border", "separatorColor": "border" }, + "Gutter": { + "VcsChanges.width": 4 + }, "GutterTooltip": { "borderColor": "bg", "infoForeground": "text", @@ -522,11 +585,14 @@ "background": "bg", "backgroundColor": "bg", "borderColor": "border", + "defaultTextBorderInsets": "16,16,16,16", "foreground": "fg", "infoForeground": "text", "shortcutForeground": "text", "shortcutTextColor": "text", - "textColor": "fg" + "smallTextBorderInsets": "8,12,8,12", + "textColor": "fg", + "verticalGap": 8 }, "Hg.Log.Ref": { "Branch": "accent", @@ -594,6 +660,7 @@ "link": "accent", "Link": { "activeForeground": "accent", + "focusedBorderColor": "accent", "hoverForeground": "accent", "pressedForeground": "accent", "secondaryForeground": "text", @@ -605,27 +672,61 @@ "link.visited.foreground": "accent", "List": { "background": "bg", + "Button": { + "hoverBackground": "hl", + "leftRightInset": 8, + "separatorColor": "border", + "separatorInset": 4 + }, "foreground": "fg", "hoverBackground": "hl", "hoverInactiveBackground": "table", + "Line.hoverBackground": "selBg", + "rowHeight": "28", + "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "table", - "selectionInactiveForeground": "activeFg" + "selectionInactiveForeground": "activeFg", + "Tag": { + "background": "button", + "foreground": "fg" + } }, "LiveIndicator": { "color": "accent" }, + "macOSWindow.Title": { + "height": 30, + "heightSmall": 20 + }, + "MainMenu": { + "background": "hc", + "foreground": "fg", + "selectionForeground": "activeFg", + "selectionBackground": "selBg" + }, "MainToolbar": { - "Dropdown.background": "bg", - "Dropdown.hoverBackground": "border", - "Dropdown.pressedBackground": "table", - "Icon.background": "bg", - "Icon.hoverBackground": "border", - "Icon.pressedBackground": "table", "background": "bg", - "hoverBackground": "border", + "Button": { + "buttonInsets": "0,0,0,0" + }, + "Dropdown": { + "borderInsets": "6,12,6,12", + "background": "bg", + "foreground": "fg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, + "hoverBackground": "hl", + "Icon": { + "borderInsets": "10,10,10,10", + "background": "bg", + "hoverBackground": "hl", + "pressedBackground": "table" + }, "inactiveBackground": "bg", - "pressedBackground": "table" + "pressedBackground": "table", + "separatorColor": "border" }, "material": { "background": "bg", @@ -652,11 +753,15 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "borderColor": "second", "disabledBackground": "second", "disabledForeground": "dis", "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "selectionForeground": "activeFg", "separatorColor": "border" @@ -676,7 +781,7 @@ "acceleratorForeground": "text", "acceleratorSelectionForeground": "activeFg", "background": "bg", - "border": "4,2,4,2", + "border": "8,8,8,8", "disabledBackground": "bg", "disabledForeground": "dis", "foreground": "fg", @@ -699,11 +804,13 @@ "background": "bg" }, "SearchField": { - "background": "hc" - } + "background": "cs" + }, + "separatorWidth": 6 }, "NewPSD.warning": "accent", "Notification": { + "arc": 16, "Error.foreground": "accent", "Link.foreground": "accent", "background": "notif", @@ -719,12 +826,18 @@ "innerBorderColor": "button" }, "ToolWindow": { + "Button.DragAndDrop": { + "buttonFloatingBackground": "button", + "stripeBackground": "bg" + }, "errorBackground": "notifError", "errorBorderColor": "notifError", "errorForeground": "fg", + "infoBackground": "notif", + "infoBorderColor": "notif", "infoForeground": "fg", - "informativeBackground": "notifInfo", - "informativeBorderColor": "notifInfo", + "informativeBackground": "notif", + "informativeBorderColor": "notif", "informativeForeground": "fg", "warningBackground": "notifWarn", "warningBorderColor": "notifWarn", @@ -736,7 +849,8 @@ }, "ToolWindowInfo": { "foreground": "fg", - "background": "notifInfo" + "background": "notif", + "borderColor": "notif" }, "ToolWindowWarning": { "foreground": "fg", @@ -786,7 +900,7 @@ "lineSeparatorColor": "table" }, "PasswordField": { - "background": "hc", + "background": "cs", "capsLockIconColor": "accent", "caretForeground": "accent", "foreground": "fg", @@ -796,6 +910,7 @@ }, "Plugins": { "background": "bg", + "borderColor": "border", "disabledForeground": "dis", "eapTagBackground": "hl", "hoverBackground": "hl", @@ -817,8 +932,11 @@ "updateBorderColor": "button", "updateForeground": "fg" }, + "ScreenshotPagination": { + "CurrentImage.fillColor": "accent" + }, "SearchField": { - "background": "hc", + "background": "cs", "borderColor": "border" }, "SectionHeader": { @@ -836,27 +954,38 @@ }, "Popup": { "Advertiser": { + "borderInsets": "6,20,6,20", "background": "bg", "borderColor": "bg", "foreground": "accent" }, + "Body": { + "bottomInsetNoAd": 8, + "bottomInsetBeforeAd": 8, + "topInsetNoHeader": 8 + }, "Border": { "color": "cs", "inactiveColor": "bg" }, + "background": "notif", "borderColor": "cs", + "borderWidth": 0, "inactiveBorderColor": "bg", "innerBorderColor": "second", "Header": { "activeBackground": "bg", - "inactiveBackground": "cs" + "inactiveBackground": "cs", + "inactiveForeground": "text" }, - "paintBorder": true, + "paintBorder": false, "preferences": { "background": "bg", "borderColor": "bg", "foreground": "fg" }, + "Selection.arc": 8, + "Selection.leftRightInset": 8, "Separator": { "foreground": "fg", "color": "border" @@ -872,13 +1001,24 @@ }, "PopupMenu": { "background": "bg", - "border": "2,0,2,0", + "borderWidth": 1, + "border": "8,8,8,8", + "borderCornerRadius": 8, "foreground": "fg", + "Selection": { + "arc": 8, + "innerInsets": "8,2,8,2" + }, "selectionBackground": "selBg", "translucentBackground": "bg" }, - "PopupMenuSeparator.height": 10, - "PopupMenuSeparator.stripeIndent": 5, + "PopupMenuSeparator": { + "height": 10, + "stripeWidth": 2, + "stripeIndent": 5, + "withToEdge": 4, + "borderCornerRadius": 8 + }, "ProgressBar": { "background": "bg", "foreground": "accent", @@ -922,12 +1062,27 @@ "selectionBackground": "selBg", "selectionForeground": "selFg" }, + "ReviewList": { + "state.background": "second", + "state.foreground": "fg" + }, "RunWidget": { + "background": "button", + "Debug.activeBackground": "hl", + "foreground": "fg", + "hoverBackground": "table", + "pressedBackground": "hl", + "Profile.activeBackground": "hl", + "runningBackground": "hl", + "runningForeground": "selFg", + "Run.activeBackground": "hl", "Running": { - "background": "accent", - "leftHoverBackground": "accent70", - "leftPressedBackground": "accent" - } + "background": "hl", + "foreground": "selFg", + "leftHoverBackground": "hl", + "leftPressedBackground": "hl" + }, + "separatorColor": "border" }, "ScreenView.borderColor": "border", "scrollbar": "bg", @@ -971,8 +1126,9 @@ }, "SearchEverywhere": { "Advertiser": { - "background": "cs", - "foreground": "text" + "background": "bg", + "foreground": "text", + "borderInsets": "10,20,10,20" }, "background": "bg", "Dialog": { @@ -989,11 +1145,12 @@ "Separator.foreground": "text", "selectionBackground": "selBg", "separatorColor": "border", - "separatorForeground": "text" + "separatorForeground": "text", + "settingsBackground": "bg" }, "SearchField": { "Border.color": "hl", - "background": "hc", + "background": "cs", "borderColor": "hl", "grayForeground": "dis", "infoForeground": "dis" @@ -1015,8 +1172,13 @@ "startColor": "accent" }, "SearchField.errorBackground": "notif", + "SearchFieldWithExtension": { + "background": "cs" + }, "SearchOption": { - "selectedBackground": "table" + "selectedBackground": "table", + "selectedPressedBackground": "hl", + "selectedHoveredBackground": "hl" }, "SearchResults": { "Ordinal.File.Foreground": "text", @@ -1056,12 +1218,12 @@ "SpeedSearch": { "background": "hl", "borderColor": "border", - "errorForeground": "fg", + "errorForeground": "red", "foreground": "fg" }, "Spinner": { "background": "bg", - "border": "3,3,3,3", + "border": "4,4,4,4", "disabledBackground": "excl", "foreground": "fg", "selectionForeground": "activeFg" @@ -1077,15 +1239,17 @@ "Breadcrumbs": { "floatingBackground": "tree", "floatingForeground": "fg", + "floatingToolbarInsets": "8,12,8,12", "foreground": "fg", "hoverBackground": "tree", "hoverForeground": "fg", + "itemBackgroundInsets": "2,4,2,4", "selectionBackground": "selBg", "selectionForeground": "activeFg", "selectionInactiveBackground": "button", "selectionInactiveForeground": "fg" }, - "borderColor": "bg", + "borderColor": "border", "bottomColor": "bg", "hoverBackground": "hl", "top2Color": "bg", @@ -1096,7 +1260,8 @@ "hoverBackground": "hl", "hoverForeground": "selFg", "pressedBackground": "button", - "pressedForeground": "fg" + "pressedForeground": "fg", + "widgetInsets": "8,12,8,12" } }, "TabbedPane": { @@ -1126,6 +1291,7 @@ "shadow": "hc", "tabHeight": 32, "tabInsets": "5,10,5,10", + "tabSelectionArc": 4, "tabSelectionHeight": 2, "tabsOverlapBorder": true, "underlineColor": "accent" @@ -1134,13 +1300,13 @@ "Table": { "alternativeRowBackground": "cs", "background": "bg", - "cellNoFocusBorder": "10,5,10,5", + "cellNoFocusBorder": "16,4,16,4", "disabledForeground": "dis", "dropLineColor": "accent", "dropLineShortColor": "accent", "focusCellBackground": "table", "focusCellForeground": "activeFg", - "focusCellHighlightBorder": "10,5,10,5", + "focusCellHighlightBorder": "18,6,18,6", "foreground": "fg", "gridColor": "bg", "highlightOuter": "table", @@ -1150,6 +1316,7 @@ "lightSelectionForeground": "activeFg", "lightSelectionInactiveBackground": "second", "lightSelectionInactiveForeground": "text", + "rowHeight": 32, "selectionBackground": "table", "selectionForeground": "activeFg", "selectionInactiveBackground": "table", @@ -1160,14 +1327,14 @@ }, "TableHeader": { "background": "button", + "bottomSeparatorColor": "border", "borderColor": "hl", - "bottomSeparatorColor": "hl", - "cellBorder": "4,0,4,0", + "cellBorder": "6,0,6,0", "disabledForeground": "dis", "focusCellBackground": "table", "focusCellForeground": "activeFg", "foreground": "fg", - "height": 25, + "height": 32, "hoverBackground": "hl", "separatorColor": "border" }, @@ -1182,7 +1349,7 @@ "textHighlightText": "activeFg", "textText": "text", "TextArea": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", @@ -1190,7 +1357,7 @@ "selectionForeground": "activeFg" }, "TextField": { - "background": "hc", + "background": "cs", "borderColor": "bg", "caretForeground": "accent", "disabledBackground": "excl", @@ -1205,15 +1372,21 @@ "separatorColorDisabled": "bg" }, "TextPane": { - "background": "hc", + "background": "cs", "caretForeground": "accent", "foreground": "fg", "inactiveForeground": "dis", "selectionBackground": "table", "selectionForeground": "activeFg" }, + "TipOfTheDay": { + "Image.borderColor": "border" + }, "TitlePane": { - "Button.hoverBackground": "hl", + "Button": { + "hoverBackground": "hl", + "preferredSize": "48,40" + }, "background": "hc", "inactiveBackground": "bg", "inactiveInfoForeground": "dis", @@ -1240,7 +1413,9 @@ "borderHandleColor": "text", "comboBoxButtonBackground": "button", "floatingForeground": "text", - "foreground": "fg" + "foreground": "fg", + "verticalToolbarInsets": "6,6,6,6", + "horizontalToolbarInsets": "6,6,6,6" }, "ToolbarComboWidget": { "background": "button", @@ -1252,6 +1427,7 @@ "description.title.text.color": "fg" }, "ToolTip": { + "arc": 6, "actions": { "background": "bg" }, @@ -1262,8 +1438,10 @@ }, "background": "notif", "borderColor": "border", + "borderCornerRadius": 8, "foreground": "fg", "infoForeground": "text", + "linkForeground": "accent", "Learning": { "background": "accent", "borderColor": "accent", @@ -1284,6 +1462,10 @@ "background": "hc", "Button": { "hoverBackground": "table", + "DragAndDrop": { + "stripeBackground": "cs", + "buttonDropBackground": "accent70" + }, "selectedBackground": "cs", "selectedForeground": "activeFg" }, @@ -1296,6 +1478,7 @@ "tab.selected.background": "cs" }, "Header": { + "height": 42, "background": "second", "borderColor": "second", "inactiveBackground": "bg" @@ -1308,13 +1491,17 @@ "hoverBackground": "hl", "hoverInactiveBackground": "hl", "inactiveUnderlineColor": "accent", + "leftRightInsets": "0,12,0,12", "selectedBackground": "cs", "selectedInactiveBackground": "cs", + "underlineArc": 4, "underlineColor": "accent", + "underlineHeight": 3, "underlinedTabBackground": "table", "underlinedTabForeground": "selFg", "underlinedTabInactiveBackground": "hc", - "underlinedTabInactiveForeground": "fg" + "underlinedTabInactiveForeground": "fg", + "verticalPadding": 6 }, "inactive": { "Header.background": "bg", @@ -1322,13 +1509,15 @@ } }, "Tree": { + "border": "4,12,4,12", "background": "hc", "foreground": "text", + "errorForeground": "red", "hash": "border", "hoverBackground": "tree", "hoverInactiveBackground": "table", "modifiedItemForeground": "accent", - "rowHeight": 28, + "rowHeight": "28", "selectionBackground": "tree", "selectionForeground": "selFg", "selectionInactiveBackground": "tree", @@ -1355,7 +1544,6 @@ "hoverBorderColor": "hl" }, "Label.foreground": "text", - "List.selectionBackground": "tree", "highStroke.foreground": "fg", "motion": { "AddConstraintColor": "accent", @@ -1392,6 +1580,35 @@ "ourML_BarColor.separatorColor": "border", "timeLine.disabledBorderColor": "border" }, + "PackageDetails": { + "border": "accent", + "infoBanner": "accent" + }, + "PackageSearch": { + "PackagesList.rowHeight": 28, + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + }, + "PackageTagSelected": { + "background": "selBg", + "foreground": "selFg" + }, + "SearchResult": { + "background": "cs", + "hoverBackground": "tree", + "PackageTag": { + "background": "excl", + "foreground": "fg", + "hoverBackground": "tree", + "selectedBackground": "selBg", + "selectedForeground": "selFg" + } + } + }, "Panel": { "background": "bg", "borderColor": "border", @@ -1418,7 +1635,7 @@ }, "VersionControl": { "FileHistory.Commit": { - "otherBranchBackground": "bg", + "otherBranchBackground": "excl", "selectedBranchBackground": "bg" }, "GitCommits": { @@ -1443,9 +1660,15 @@ "Commit": { "currentBranchBackground": "cs", "hoveredBackground": "tree", + "rowHeight": 28, "unmatchedForeground": "text" } }, + "MarkerPopup": { + "borderColor": "border", + "borderInsets": "6,8,6,10", + "Toolbar.background": "hl" + }, "Ref": { "backgroundBase": "hl", "foreground": "activeFg" @@ -1455,6 +1678,11 @@ "foreground": "activeFg" } }, + "UnattendedHostStatus": { + "warningBackground": "yellow", + "warningForeground": "activeFg", + "dangerBackground": "red" + }, "Viewport": { "background": "hc", "foreground": "fg" 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 db985f73..2b384043 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 @@ -126,6 +126,12 @@ "matchForeground": "accentColor" }, + "ComplexPopup": { + "Header": { + "background": "backgroundColor" + } + }, + "Component": { "errorFocusColor": "#802d43", "inactiveErrorFocusColor": "#522530", @@ -156,7 +162,10 @@ "SearchField": { "background": "#282c34" }, - "shortcutForeground": "accentColor" + "shortcutForeground": "accentColor", + "ToolTip": { + "background": "#323844" + } }, "EditorPane.inactiveBackground": "#282c34", @@ -205,6 +214,19 @@ "selectionForeground": "#ffffff" }, + "MainToolbar": { + "inactiveBackground": "#282c34", + "background": "backgroundColor", + "Dropdown": { + "hoverBackground": "#3d424b" + } + }, + + "MemoryIndicator": { + "allocatedBackground": "#304676", + "usedBackground": "#3a5a9c" + }, + "Notification": { "background": "notificationBackground", "borderColor": "#53565f", @@ -279,6 +301,7 @@ }, "Popup": { + "background": "#282c34", "paintBorder": false, "borderColor": "#21252b", "Toolbar.borderColor": "#3d424b", @@ -293,12 +316,18 @@ "ProgressBar": { "trackColor": "#1D1D26", "progressColor": "accentColor", - "indeterminateStartColor": "accentColor", - "indeterminateEndColor": "#313469", - "failedColor": "#bd3c5f", - "failedEndColor": "#472c33", - "passedColor": "#239E62", - "passedEndColor": "#2b4242" + "indeterminateStartColor": "#313469", + "indeterminateEndColor": "accentColor", + "failedColor": "#472c33", + "failedEndColor": "#bd3c5f", + "passedColor": "#2b4242", + "passedEndColor": "#239E62" + }, + + "RunWidget": { + "foreground": "#eef3ff", + "separatorColor": "#eef3ff", + "background": "accentColor" }, "SearchEverywhere": {