diff --git a/CHANGELOG.md b/CHANGELOG.md index f1832ed2..9d2a186e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ FlatLaf Change Log #### New features and improvements - JIDE Common Layer: Support `RangeSlider`. (PR #209) +- IntelliJ Themes: + - Added "Gradianto Nature Green" theme. + - Updated "Arc Dark", "Cyan", "Dark purple", "Gradianto", "Gray", "Gruvbox" + and "One Dark" themes. #### Fixed bugs 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 948b6e61..39cf75cb 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 @@ -4,14 +4,14 @@ "license": "MIT", "licenseFile": "arc-themes.LICENSE.txt", "sourceCodeUrl": "https://gitlab.com/zlamalp/arc-theme-idea", - "sourceCodePath": "blob/master/resources/arc-theme.theme.json" + "sourceCodePath": "blob/master/arc-theme-idea-light/resources/arc-theme.theme.json" }, "arc-theme-orange.theme.json": { "name": "Arc - Orange", "license": "MIT", "licenseFile": "arc-themes.LICENSE.txt", "sourceCodeUrl": "https://gitlab.com/zlamalp/arc-theme-idea", - "sourceCodePath": "blob/master/resources/arc-theme-orange.theme.json" + "sourceCodePath": "blob/master/arc-theme-idea-light/resources/arc-theme-orange.theme.json" }, "arc_theme_dark.theme.json": { "name": "Arc Dark", @@ -19,7 +19,7 @@ "license": "MIT", "licenseFile": "arc-themes.LICENSE.txt", "sourceCodeUrl": "https://gitlab.com/zlamalp/arc-theme-idea", - "sourceCodePath": "blob/master/resources/arc_theme_dark.theme.json" + "sourceCodePath": "blob/master/arc-theme-idea-dark/resources/arc_theme_dark.theme.json" }, "arc_theme_dark_orange.theme.json": { "name": "Arc Dark - Orange", @@ -27,7 +27,7 @@ "license": "MIT", "licenseFile": "arc-themes.LICENSE.txt", "sourceCodeUrl": "https://gitlab.com/zlamalp/arc-theme-idea", - "sourceCodePath": "blob/master/resources/arc_theme_dark_orange.theme.json" + "sourceCodePath": "blob/master/arc-theme-idea-dark/resources/arc_theme_dark_orange.theme.json" }, "Carbon.theme.json": { "name": "Carbon", @@ -74,7 +74,7 @@ "license": "MIT", "licenseFile": "Dracula.LICENSE.txt", "sourceCodeUrl": "https://github.com/dracula/jetbrains", - "sourceCodePath": "blob/master/src/main/resources/themes/Dracula.theme.json" + "sourceCodePath": "blob/master/src/main/resources/themes/dracula.theme.json" }, "Gradianto_dark_fuchsia.theme.json": { "name": "Gradianto Dark Fuchsia", @@ -100,6 +100,14 @@ "sourceCodeUrl": "https://github.com/thvardhan/Gradianto", "sourceCodePath": "blob/master/src/main/resources/Gradianto_midnight_blue.theme.json" }, + "Gradianto_Nature_Green.theme.json": { + "name": "Gradianto Nature Green", + "dark": true, + "license": "MIT", + "licenseFile": "Gradianto.LICENSE.txt", + "sourceCodeUrl": "https://github.com/thvardhan/Gradianto", + "sourceCodePath": "blob/master/src/main/resources/Gradianto_Nature_Green.theme.json" + }, "Gray.theme.json": { "name": "Gray", "license": "MIT", diff --git a/flatlaf-intellij-themes/README.md b/flatlaf-intellij-themes/README.md index bf03932f..96e523c8 100644 --- a/flatlaf-intellij-themes/README.md +++ b/flatlaf-intellij-themes/README.md @@ -60,6 +60,7 @@ Name | Class [Gradianto Dark Fuchsia](https://github.com/thvardhan/Gradianto) | `com.formdev.flatlaf.intellijthemes.FlatGradiantoDarkFuchsiaIJTheme` [Gradianto Deep Ocean](https://github.com/thvardhan/Gradianto) | `com.formdev.flatlaf.intellijthemes.FlatGradiantoDeepOceanIJTheme` [Gradianto Midnight Blue](https://github.com/thvardhan/Gradianto) | `com.formdev.flatlaf.intellijthemes.FlatGradiantoMidnightBlueIJTheme` +[Gradianto Nature Green](https://github.com/thvardhan/Gradianto) | `com.formdev.flatlaf.intellijthemes.FlatGradiantoNatureGreenIJTheme` [Gray](https://github.com/OlyaB/GreyTheme) | `com.formdev.flatlaf.intellijthemes.FlatGrayIJTheme` [Gruvbox Dark Hard](https://github.com/Vincent-P/gruvbox-intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkHardIJTheme` [Gruvbox Dark Medium](https://github.com/Vincent-P/gruvbox-intellij-theme) | `com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkMediumIJTheme` diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java index 20f30aed..a728432e 100644 --- a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatAllIJThemes.java @@ -42,6 +42,7 @@ public class FlatAllIJThemes new LookAndFeelInfo( "Gradianto Dark Fuchsia", "com.formdev.flatlaf.intellijthemes.FlatGradiantoDarkFuchsiaIJTheme" ), new LookAndFeelInfo( "Gradianto Deep Ocean", "com.formdev.flatlaf.intellijthemes.FlatGradiantoDeepOceanIJTheme" ), new LookAndFeelInfo( "Gradianto Midnight Blue", "com.formdev.flatlaf.intellijthemes.FlatGradiantoMidnightBlueIJTheme" ), + new LookAndFeelInfo( "Gradianto Nature Green", "com.formdev.flatlaf.intellijthemes.FlatGradiantoNatureGreenIJTheme" ), new LookAndFeelInfo( "Gray", "com.formdev.flatlaf.intellijthemes.FlatGrayIJTheme" ), new LookAndFeelInfo( "Gruvbox Dark Hard", "com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkHardIJTheme" ), new LookAndFeelInfo( "Gruvbox Dark Medium", "com.formdev.flatlaf.intellijthemes.FlatGruvboxDarkMediumIJTheme" ), diff --git a/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatGradiantoNatureGreenIJTheme.java b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatGradiantoNatureGreenIJTheme.java new file mode 100644 index 00000000..b58cb40b --- /dev/null +++ b/flatlaf-intellij-themes/src/main/java/com/formdev/flatlaf/intellijthemes/FlatGradiantoNatureGreenIJTheme.java @@ -0,0 +1,48 @@ +/* + * Copyright 2020 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// +// DO NOT MODIFY +// Generated with com.formdev.flatlaf.demo.intellijthemes.IJThemesClassGenerator +// + +package com.formdev.flatlaf.intellijthemes; + +import com.formdev.flatlaf.IntelliJTheme; + +/** + * @author Karl Tauber + */ +public class FlatGradiantoNatureGreenIJTheme + extends IntelliJTheme.ThemeLaf +{ + public static boolean install( ) { + try { + return install( new FlatGradiantoNatureGreenIJTheme() ); + } catch( RuntimeException ex ) { + return false; + } + } + + public FlatGradiantoNatureGreenIJTheme() { + super( Utils.loadTheme( "Gradianto_Nature_Green.theme.json" ) ); + } + + @Override + public String getName() { + return "Gradianto Nature Green"; + } +} diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json index 143590b1..021630a8 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Cyan.theme.json @@ -88,6 +88,10 @@ "hoverBackground": "#ced2d9" }, + "DragAndDrop": { + "areaBackground": "#4cb2c733" + }, + "Editor": { "background": "#d0d3d9", "foreground": "#808080", @@ -201,7 +205,10 @@ "contentAreaColor": "#bec5cd" }, - "Table.background": "#eef0f4", + "Table": { + "background": "#eef0f4", + "hoverBackground": "#C3D2E366" + }, "TableHeader": { "cellBorder": "3,0,3,0", @@ -242,7 +249,12 @@ } }, - "Tree.background": "#eef0f4" + "Tree.background": "#eef0f4", + + "WelcomeScreen": { + "Details.background": "#eef0f4", + "Projects.actions.background": "#E1E4EB" + } }, "icons": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json index c212eeb2..2cfc2bab 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/DarkPurple.theme.json @@ -51,7 +51,8 @@ "hoverBackground": "#453e57", "hoverBorderColor": "#453E57", "pressedBackground": "#49415c", - "pressedBorderColor": "#49415C" + "pressedBorderColor": "#49415C", + "focusedBorderColor": "#476fcc" }, "Button": { @@ -94,7 +95,8 @@ "matchForeground": "#ED94FF", "matchSelectionForeground": "#ED94FF", "selectionInactiveBackground": "#44405c", - "nonFocusedMask": "#00000033" + "nonFocusedMask": "#00000033", + "selectionBackground": "#623380" }, "Component": { @@ -123,7 +125,7 @@ "DragAndDrop": { "areaForeground": "#D0D0D9", - "areaBackground": "#702F91", + "areaBackground": "#5d476680", "areaBorderColor": "#343142" }, @@ -166,7 +168,7 @@ "visitedForeground": "#7094FF" }, - "MenuBar.borderColor": "##1a1721", + "MenuBar.borderColor": "#1a1721", "NavBar.borderColor": "#1a1721", @@ -280,6 +282,8 @@ "endBackground": "#cca929" }, + "SearchOption.selectedBackground": "#424885", + "SpeedSearch": { "foreground": "#D0D0D9", "borderColor": "#69418c", @@ -304,7 +308,10 @@ "bottomSeparatorColor": "#282430" }, - "Table.stripeColor": "#323242", + "Table": { + "stripeColor": "#323242", + "hoverBackground": "#00000028" + }, "TextArea": { "background": "#3A384D", @@ -327,7 +334,9 @@ "ToolTip": { "background": "#463f57", - "Actions.background": "#323245" + "Actions.background": "#323245", + "infoForeground": "#8985a1", + "shortcutForeground": "#8985A1" }, "ToolWindow": { @@ -363,14 +372,17 @@ "VersionControl": { "Log.Commit": { "currentBranchBackground": "#202340", - "unmatchedForeground": "#6d6a80" + "unmatchedForeground": "#6d6a80", + "hoveredBackground": "#000000B9" }, "FileHistory.Commit.selectedBranchBackground": "#202340" }, "WelcomeScreen": { "Projects.selectionInactiveBackground": "#713a91", - "separatorColor": "#1a1721" + "separatorColor": "#1a1721", + "Details.background": "#26262E", + "Projects.actions.background": "#343445" } }, 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 f963edfd..0f0fd1e2 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 @@ -1,14 +1,14 @@ { "name": "Dracula", "dark": true, - "author": "VermouthX", - "editorScheme": "/themes/Dracula.xml", + "author": "Zihan Ma", + "editorScheme": "/themes/dracula.xml", "ui": { "*": { - "arc": "5", + "arc": "7", "background": "#414450", "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4E5A82", + "selectionInactiveBackground": "#4e5a82", "inactiveBackground": "#414450", "borderColor": "#282a36" }, @@ -58,7 +58,7 @@ }, "CompletionPopup": { "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4E5A82", + "selectionInactiveBackground": "#4e5a82", "matchForeground": "#ff79c6" }, "Component": { @@ -148,7 +148,7 @@ "failedEndColor": "#ff5554", "trackColor": "#6272a4", "progressColor": "#ff79c6", - "indeterminateStartColor": "#bd93f9", + "indeterminateStartColor": "#93b8f9", "indeterminateEndColor": "#bd93f9", "passedColor": "#50fa7b", "passedEndColor": "#50fa7b" @@ -161,6 +161,7 @@ }, "ScrollBar": { "Mac": { + "hoverThumbColor": "#bd93f9", "Transparent": { "hoverThumbColor": "#bd93f9" } @@ -212,7 +213,7 @@ "Tree": { "modifiedItemForeground": "#ff79c6", "selectionBackground": "#6272a4", - "selectionInactiveBackground": "#4E5A82" + "selectionInactiveBackground": "#4e5a82" }, "ValidationTooltip": { "errorBackground": "#ff5554", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json new file mode 100644 index 00000000..ac5c3eb7 --- /dev/null +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_Nature_Green.theme.json @@ -0,0 +1,266 @@ +{ + "author": "thvardhan", + "dark": true, + "editorScheme": "/Gradianto_Nature_Green.xml", + "icons": { + "ColorPalette": { + "Checkbox.Border.Default": "#3f765a", + "Checkbox.Border.Default.Dark": "#3f765a", + "Checkbox.Background.Default.Dark": "#3f765a", + "Checkbox.Foreground.Selected.Dark": "#00d679", + "Checkbox.Background.Disabled": "#274439", + "Checkbox.Background.Disabled.Dark": "#1e3b2f", + "Objects.Grey": "#e3e3e3c0", + "Objects.Blue": "#4fc3f7c0", + "Objects.RedStatus": "#ff5722c0", + "Objects.Red": "#e07483c0", + "Objects.Pink": "#de6dc2c0", + "Objects.Yellow": "#ffca57c0", + "Objects.Green": "#76da84c0", + "Objects.Purple": "#d199ffc0", + "Objects.BlackText": "#2e2e2ec0", + "Objects.YellowDark": "#ffca1ec0", + "Objects.GreenAndroid": "#18e66bc0" + } + }, + "name": "Gradianto Nature Green", + "ui": { + "*": { + "background": "#20403f", + "foreground": "#cccece", + "infoForeground": "#29d57cc1", + "selectionBackground": "#00695c", + "selectionForeground": "#f1f4f6", + "selectionInactiveBackground": "#0465465c", + "disabledForeground": "#a3a3a3", + "disabledBackground": "#104942", + "inactiveBackground": "#257b71", + "errorForeground": "#b5b5b5", + "disabledText": "#adadad", + "Borders.ContrastBorderColor": "#12312d", + "borderColor": "#0a373b", + "disabledBorderColor": "#0b2d26", + "focusColor": "#265752", + "focusedBorderColor": "#1a7469", + "separatorColor": "#20574f" + }, + "Tree": { + "background": "#203a40", + "selectionBackground": "#00695c" + }, + "ActionButton": { + "hoverBackground": "#084934", + "pressedBackground": "#025248", + "hoverBorderColor": "#074045", + "pressedBorderColor": "#063034" + }, + "Borders": { + "color": "#1d3e30a3", + "ContrastBorderColor": "#14342d" + }, + "Button": { + "startBackground": "#4aa275", + "endBackground": "#4aa275", + "startBorderColor": "#254b45", + "endBorderColor": "#254b45", + "focusedBorderColor": "#4aa295", + "default.focusColor": "#4aa295", + "disabledBorderColor": "#198157", + "default": { + "startBackground": "#4aa275", + "endBackground": "#4aa275", + "focusColor": "#29a2a2" + } + }, + "CompletionPopup": { + "matchForeground": "#56f29c" + }, + "Notification": { + "errorForeground": "#f5f5f5", + "errorBackground": "#c4131e", + "errorBorderColor": "#c55e4a", + "ToolWindow": { + "informativeForeground": "#f5f5f5", + "informativeBackground": "#414f66", + "informativeBorderColor": "#d4745c", + "warningForeground": "#abb2bf", + "warningBackground": "#896a28", + "warningBorderColor": "#5f4422", + "errorForeground": "#abb2bf", + "errorBackground": "#923849", + "errorBorderColor": "#552029" + } + }, + "ComboBox": { + "background": "#356c43", + "nonEditableBackground": "#356c43", + "ArrowButton": { + "iconColor": "#e3e2f1", + "disabledIconColor": "#83828b", + "nonEditableBackground": "#35a787" + } + }, + "Editor": { + "shortcutForeground": "#3f795b" + }, + "EditorTabs": { + "selectedForeground": "#eceff1", + "selectedBackground": "#006448", + "underlinedTabBackground": "#07664848", + "background": "#1e3b39", + "borderColor": "#033e25", + "underlineColor": "#008f666a", + "hoverMaskColor": "#468f67", + "inactiveMaskColor": "#244a31ff" + }, + "Link": { + "activeForeground": "#cdd0c5", + "hoverForeground": "#cded91", + "pressedForeground": "#8da75e", + "visitedForeground": "#cebebe" + }, + "FileColor": { + "Yellow": "#cee51219", + "Green": "#98c3791a", + "Blue": "#61afef1a", + "Violet": "#542a4f1a", + "Orange": "#d13c001a", + "Rose": "#ae002f1a" + }, + "SearchEverywhere": { + "Tab": { + "selectedForeground": "#ffffff", + "selectedBackground": "#2f7d5d" + } + }, + "SearchMatch": { + "startBackground": "#679d81", + "endBackground": "#2d7156" + }, + "WelcomeScreen": { + "Projects.selectionInactiveBackground": "#32805e", + "separatorColor": "#249273" + }, + "ValidationTooltip": { + "errorBackground": "#802d43", + "errorBorderColor": "#802d43", + "warningBackground": "#735822", + "warningBorderColor": "#5f4422" + }, + "Table": { + "stripeColor": "#476f5e", + "selectionForeground": "#e4e4e4", + "dropLineColor": "#588d67", + "focusCellForeground": "#e3e3e3", + "gridColor": "#456f58" + }, + "ProgressBar": { + "trackColor": "#132f20", + "progressColor": "#60cf92", + "indeterminateStartColor": "#68f296", + "indeterminateEndColor": "#30695c", + "failedColor": "#ad387e", + "failedEndColor": "#47221d", + "passedColor": "#7edb7f", + "passedEndColor": "#2f422f" + }, + "windowBorder": "#285738", + "window": "#285741", + "PopupMenu.translucentBackground": "#266d48", + "Popup": { + "inactiveBorderColor": "#254933", + "paintBorder": true, + "Header.activeBackground": "#397e66", + "Header.inactiveBackground": "#2b6d53", + "separatorColor": "#225740", + "separatorForeground": "#42a873", + "Advertiser": { + "background": "#2f473d", + "borderColor": "#143427", + "borderInsets": "3,8,5,0" + } + }, + "ToggleButton": { + "onForeground": "#27683f", + "onBackground": "#9ca9af", + "offForeground": "#646464", + "offBackground": "#1c3228", + "buttonColor": "#3c855f" + }, + "ToolTip": { + "background": "#448366", + "Actions.background": "#253a33" + }, + "ToolWindow": { + "Header": { + "background": "#2e7253", + "inactiveBackground": "#2f5e47e8" + }, + "HeaderTab": { + "selectedBackground": "#397e55ff", + "selectedInactiveBackground": "#2c5947ff", + "hoverBackground": "#38715fff", + "hoverInactiveBackground": "#254a3aff" + }, + "Button": { + "hoverBackground": "#387158ff", + "selectedBackground": "#397e74ff", + "selectedForeground": "#b1c6c4" + } + }, + "TabbedPane": { + "focusColor": "#2c6a56", + "hoverColor": "#34795d", + "underlineColor": "#7fa89b" + }, + "DragAndDrop": { + "areaForeground": "#e5e5e5", + "areaBackground": "#243937", + "areaBorderColor": "#143427" + }, + "Plugins": { + "SectionHeader.background": "#2a6346", + "tagBackground": "#3d5a50", + "lightSelectionBackground": "#3c7e64" + }, + "VersionControl": { + "Log.Commit.currentBranchBackground": "#225740", + "Log.Commit.unmatchedForeground": "#94aba8" + }, + "ScrollBar" : { + "hoverThumbBorderColor" : "#39666394", + "background" : "#16322cff", + "hoverThumbColor": "#1f3e38b2", + "hoverTrackColor": "#224039ff", + "thumb": "#20403aff", + "thumbBorderColor": "#39666394", + "thumbColor": "#20403d94", + "thumbDarkShadow": "#122623ff", + "thumbHighlight": "#2a4f4cff", + "thumbShadow": "#162b24ff", + "track": "#182d26ff", + "Transparent": { + "thumbColor": "#20403d94", + "hoverThumbBorderColor" : "#14262694", + "hoverThumbColor": "#1f3e38b2", + "hoverTrackColor": "#224039ff", + "thumbBorderColor": "#14262694" + }, + "Mac" : { + "Transparent": { + "thumbColor": "#20403d94", + "hoverThumbBorderColor" : "#14262694", + "hoverThumbColor": "#1f3e38b2", + "hoverTrackColor": "#224039ff", + "thumbBorderColor": "##39666394" + }, + "hoverThumbBorderColor" : "#14262694", + "hoverThumbColor": "#1f3e38b2", + "hoverTrackColor": "#224039ff", + "thumbBorderColor": "#14262694", + "thumbColor": "#20403d94" + } + }, + "EditorPane.inactiveBackground": "#254a39ff" + } +} \ No newline at end of file diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json index f1c0dd4a..dd5058f1 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_dark_fuchsia.theme.json @@ -249,6 +249,45 @@ "Tab.selectedBackground": "#a778bfff", "Tab.hoverBackground": "#82519cff" }, + "ScrollBar" : { + "hoverThumbBorderColor" : "#3a2241b2", + "background" : "#241632ff", + "hoverThumbColor": "#472950b2", + "hoverTrackColor": "#3d2240ff", + "thumb": "#2f2040ff", + "thumbBorderColor": "#2c152fff", + "thumbColor": "#2f1f4094", + "thumbDarkShadow": "#261226ff", + "thumbHighlight": "#4f2a4eff", + "thumbShadow": "#22162bff", + "track": "#23182dff", + "Transparent": { + "thumbColor": "#2f1f4094", + "hoverThumbBorderColor" : "#3a2241b2", + "hoverThumbColor": "#472950b2", + "hoverTrackColor": "#3d2240ff", + "thumbBorderColor": "#2c152fff" + }, + "Mac" : { + "Transparent": { + "thumbColor": "#2f1f4094", + "hoverThumbBorderColor" : "#3a2241b2", + "hoverThumbColor": "#472950b2", + "hoverTrackColor": "#3d2240ff", + "thumbBorderColor": "#2c152fff" + }, + "hoverThumbBorderColor" : "#3a2241b2", + "hoverThumbColor": "#472950b2", + "hoverTrackColor": "#3d2240ff", + "thumbBorderColor": "#2c152fff", + "thumbColor": "#2f1f4094" + } + }, + "TabbedPane": { + "focusColor": "#562c6a", + "hoverColor": "#633479", + "underlineColor": "#8f7fa8" + }, "EditorPane.inactiveBackground": "#5d4966" }, "icons": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json index 6c32b6f5..b518a1e7 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_deep_ocean.theme.json @@ -45,6 +45,11 @@ "color": "#2b3858cc", "ContrastBorderColor": "#0e1624" }, + "TabbedPane": { + "focusColor": "#25334b", + "hoverColor": "#374c70", + "underlineColor": "#3D7EC0" + }, "Button": { "startBackground": "#4a75a2", "endBackground": "#4a75a2", @@ -63,6 +68,40 @@ "CompletionPopup": { "matchForeground": "#568AF2" }, + "ScrollBar" : { + "hoverThumbBorderColor" : "#12182994", + "background" : "#161f3294", + "hoverThumbColor": "#313f62b2", + "hoverTrackColor": "#222a40b2", + "thumb": "#20294094", + "thumbBorderColor": "#12182994", + "thumbColor": "#20294094", + "thumbDarkShadow": "#0c0f1a94", + "thumbHighlight": "#3b496bb2", + "thumbShadow": "#161a2b94", + "track": "#181e2db2", + "Transparent": { + "thumbColor": "#20294094", + "hoverThumbBorderColor" : "#12182994", + "hoverThumbColor": "#313f62b2", + "hoverTrackColor": "#222a40b2", + "thumbBorderColor": "#12182994" + }, + "Mac" : { + "Transparent": { + "thumbColor": "#20294094", + "hoverThumbBorderColor" : "#12182994", + "hoverThumbColor": "#313f62b2", + "hoverTrackColor": "#222a40b2", + "thumbBorderColor": "#12182994" + }, + "hoverThumbBorderColor" : "#12182994", + "hoverThumbColor": "#313f62b2", + "hoverTrackColor": "#222a40b2", + "thumbBorderColor": "#12182994", + "thumbColor": "#20294094" + } + }, "Notification": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json index 8b26244f..70f7274d 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gradianto_midnight_blue.theme.json @@ -220,6 +220,45 @@ "tagBackground": "#40405a", "lightSelectionBackground": "#48387e" }, + "TabbedPane": { + "focusColor": "#3d2c6a", + "hoverColor": "#433479", + "underlineColor": "#877fa8" + }, + "ScrollBar" : { + "hoverThumbBorderColor" : "#423162ff", + "background" : "#211632ff", + "hoverThumbColor": "#3e3162ff", + "hoverTrackColor": "#2d2240ff", + "thumb": "#2b2040ff", + "thumbBorderColor": "#322141ff", + "thumbColor": "#272040ff", + "thumbDarkShadow": "#1d182fff", + "thumbHighlight": "#533b6bff", + "thumbShadow": "#1f162bff", + "track": "#28233eff", + "Transparent": { + "thumbColor": "#292040ff", + "hoverThumbBorderColor" : "#281c39ff", + "hoverThumbColor": "#423162ff", + "hoverTrackColor": "#2d2240ff", + "thumbBorderColor": "#261b3bff" + }, + "Mac" : { + "Transparent": { + "thumbColor": "#2d2040ff", + "hoverThumbBorderColor" : "#2b1f40ff", + "hoverThumbColor": "#403162ff", + "hoverTrackColor": "#2e2240ff", + "thumbBorderColor": "#1f1834ff" + }, + "hoverThumbBorderColor" : "#2d203cff", + "hoverThumbColor": "#3e3162ff", + "hoverTrackColor": "#2d2240ff", + "thumbBorderColor": "#271a37ff", + "thumbColor": "#272040ff" + } + }, "EditorPane.inactiveBackground": "#414157ff" }, "icons": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json index 00a61b99..ce9dcb9b 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/Gray.theme.json @@ -99,6 +99,8 @@ "FileColor.Yellow": "#F5F0DF", "FileColor.Green": "#E8F2DF", + "GotItTooltip.borderColor": "#0000001F", + "Label.errorForeground": "#C7222D", "Link": { @@ -137,7 +139,8 @@ "SectionHeader.foreground": "#808080", "Tab.selectedBackground": "#D5D6D7", "Tab.hoverBackground": "#D5D6D7", - "lightSelectionBackground": "#F4F9FF" + "lightSelectionBackground": "#E9EFF7", + "hoverBackground": "#f7faff" }, "Popup": { @@ -185,12 +188,13 @@ "contentAreaColor": "#E1E3E6" }, - "Table.stripeColor": "#F2F3F5", + "Table": { + "stripeColor": "#F2F3F5", + "hoverBackground": "#00000009" + }, "TableHeader": { - "cellBorder": "3,0,3,0", - "background": "#fafbfc", - "bottomSeparatorColor": "#ebedf0" + "cellBorder": "3,0,3,0" }, "TextArea.background": "#FFFFFF", @@ -225,9 +229,15 @@ "VersionControl": { "Log.Commit.currentBranchBackground": "#e6f0f2", - "FileHistory.Commit.selectedBranchBackground": "#e6f0f2" + "FileHistory.Commit.selectedBranchBackground": "#e6f0f2", + "Log.Commit.hoveredBackground": "#000000EE" + }, + + "WelcomeScreen": { + "Details.background": "#FAFBFC" } + }, "icons": { diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark.theme.json index 23250440..15df94d2 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark.theme.json @@ -28,8 +28,8 @@ "endBorderColor": "#2b2e39", "focusedBorderColor" : "#2679db", "background" : "#383c4a", - "startBackground" : "#474c5b", - "endBackground" : "#474c5b", + "startBackground" : "#444A58", + "endBackground" : "#444A58", "default": { "foreground": "#d3dae3", "startBackground": "#2679db", @@ -47,17 +47,17 @@ "ToolBar.highlight" : "#4e5467", "Popup.Toolbar.borderColor" : "#2b2e39", "ActionButton.hoverBorderColor" : "#2b2e39", - "ActionButton.hoverBackground" : "#4e5467", + "ActionButton.hoverBackground" : "#505666", "ActionButton.pressedBackground" : "#4e5467", "ActionButton.pressedBorderColor" : "#2b2e39", - "StatusBar.hoverBackground" : "#4e5467", + "StatusBar.hoverBackground" : "#505666", "StatusBar.borderColor" : "#2b2e39", "Popup.Toolbar.background" : "#474c5b", "Panel.background": "#383c4a", "Panel.foreground" : "#d3dae3", "Window.border" : "1,1,1,1,#2b2e39", "WelcomeScreen.background" : "#383c4a", - "WelcomeScreen.Projects.background" : "#474c5b", + "WelcomeScreen.Projects.background" : "#404651", "MenuBar.foreground" : "#d3dae3", "MenuBar.borderColor" : "#2b2e39", @@ -73,7 +73,7 @@ "Separator.separatorColor" : "#9ba2ab", "Group.separatorColor" : "#9ba2ab", - "Tree.background" : "#474c5b", + "Tree.background" : "#404651", "Tree.foreground" : "#d3dae3", "ProgressBar.background" : "#2679db", @@ -93,13 +93,13 @@ "ParameterInfo.background" : "#fffae3", "ParameterInfo.currentOverloadBackground" : "#fffae3", - "List.background" : "#474c5b", + "List.background" : "#404651", "List.dropLineColor" : "#2679db", "List.selectionBackground": "#2679db", "List.selectionForeground": "#ffffff", "List.selectionInactiveBackground": "#1e61b0", - "Table.background" : "#474c5b", + "Table.background" : "#404651", "Table.selectionBackground" : "#2679db", "Table.selectionForeground" : "#ffffff", "Table.lightSelectionBackground" : "#2679db", @@ -126,6 +126,7 @@ "ComboBox.nonEditableBackground" : "#474c5b", "ComboBox.ArrowButton.background" : "#474c5b", "ComboBox.ArrowButton.nonEditableBackground" : "#474c5b", + "ComboBox.disabledBackground" : "#383c4a", "ComboBoxButton.background" : "#474c5b", "TextField.background" : "#474c5b", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark_orange.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark_orange.theme.json index ef69243b..431d9bc8 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark_orange.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/arc_theme_dark_orange.theme.json @@ -28,8 +28,8 @@ "endBorderColor": "#2b2e39", "focusedBorderColor" : "#f57900", "background" : "#383c4a", - "startBackground" : "#474c5b", - "endBackground" : "#474c5b", + "startBackground" : "#444A58", + "endBackground" : "#444A58", "default": { "foreground": "#d3dae3", "startBackground": "#f57900", @@ -47,17 +47,17 @@ "ToolBar.highlight" : "#4e5467", "Popup.Toolbar.borderColor" : "#2b2e39", "ActionButton.hoverBorderColor" : "#2b2e39", - "ActionButton.hoverBackground" : "#4e5467", + "ActionButton.hoverBackground" : "#505666", "ActionButton.pressedBackground" : "#4e5467", "ActionButton.pressedBorderColor" : "#2b2e39", - "StatusBar.hoverBackground" : "#4e5467", + "StatusBar.hoverBackground" : "#505666", "StatusBar.borderColor" : "#2b2e39", "Popup.Toolbar.background" : "#474c5b", "Panel.background": "#383c4a", "Panel.foreground" : "#d3dae3", "Window.border" : "1,1,1,1,#2b2e39", "WelcomeScreen.background" : "#383c4a", - "WelcomeScreen.Projects.background" : "#474c5b", + "WelcomeScreen.Projects.background" : "#404651", "MenuBar.foreground" : "#d3dae3", "MenuBar.borderColor" : "#2b2e39", @@ -73,7 +73,7 @@ "Separator.separatorColor" : "#9ba2ab", "Group.separatorColor" : "#9ba2ab", - "Tree.background" : "#474c5b", + "Tree.background" : "#404651", "Tree.foreground" : "#d3dae3", "ProgressBar.background" : "#f57900", @@ -93,13 +93,13 @@ "ParameterInfo.background" : "#fffae3", "ParameterInfo.currentOverloadBackground" : "#fffae3", - "List.background" : "#474c5b", + "List.background" : "#404651", "List.dropLineColor" : "#f57900", "List.selectionBackground": "#f57900", "List.selectionForeground": "#ffffff", "List.selectionInactiveBackground": "#C36200", - "Table.background" : "#474c5b", + "Table.background" : "#404651", "Table.selectionBackground" : "#f57900", "Table.selectionForeground" : "#ffffff", "Table.lightSelectionBackground" : "#f57900", @@ -125,6 +125,7 @@ "ComboBox.nonEditableBackground" : "#474c5b", "ComboBox.ArrowButton.background" : "#474c5b", "ComboBox.ArrowButton.nonEditableBackground" : "#474c5b", + "ComboBox.disabledBackground" : "#383c4a", "ComboBoxButton.background" : "#474c5b", "TextField.background" : "#474c5b", diff --git a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json index 079a2e86..ae1d4681 100644 --- a/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json +++ b/flatlaf-intellij-themes/src/main/resources/com/formdev/flatlaf/intellijthemes/themes/gruvbox_dark_soft.theme.json @@ -7,6 +7,7 @@ "bg0": "#282828", "bg0_h": "#1d2021", "bg0_s": "#32302f", + "bg0_ss": "#4F4945", "bg1": "#3c3836", "bg2": "#504945", "bg3": "#665c54", @@ -45,11 +46,11 @@ "infoForeground": "fg", "lightSelectionBackground": "bg1", - "selectionBackground": "#4F4945", + "selectionBackground": "bg0_ss", "selectionForeground": "fg0", - "selectionBackgroundInactive": "bg0_s", - "selectionInactiveBackground": "bg0_s", + "selectionBackgroundInactive": "bg0_ss", + "selectionInactiveBackground": "bg0_ss", "selectedBackground": "bg0_h", "selectedForeground": "fg0", 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 5e32a8e1..912a3448 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 @@ -4,11 +4,13 @@ "author": "Mark Skelton", "editorScheme": "/themes/one_dark.xml", "colors": { - "accentColor": "#568AF2" + "accentColor": "#568AF2", + "backgroundColor": "#21252b", + "borderColor": "#333841" }, "ui": { "*": { - "background": "#21252b", + "background": "backgroundColor", "foreground": "#abb2bf", "infoForeground": "#5c6370", @@ -18,8 +20,8 @@ "selectionBackgroundInactive": "#2c313a", "selectionForeground": "#d7dae0", - "disabledBackground": "#21252b", - "inactiveBackground": "#21252b", + "disabledBackground": "backgroundColor", + "inactiveBackground": "backgroundColor", "acceleratorForeground": "#E6E6E6", "acceleratorSelectionForeground": "#E6E6E6", @@ -28,7 +30,7 @@ "borderColor": "#333841", "disabledBorderColor": "#2d3137", - "focusColor": "#21252b", + "focusColor": "backgroundColor", "focusedBorderColor": "accentColor", "separatorColor": "#32363c" @@ -47,7 +49,7 @@ "endBackground": "#3d424b", "startBorderColor": "#464c55", "endBorderColor": "#464c55", - "shadowColor": "#21252b", + "shadowColor": "backgroundColor", "focusedBorderColor": "#646a73", "default": { @@ -120,12 +122,12 @@ }, "FileColor": { - "Yellow": "#563b2255", - "Green": "#334e1f55", - "Blue": "#28436d55", - "Violet": "#37115655", - "Orange": "#562b2255", - "Rose": "#561a2b55" + "Yellow": "#3d3026", + "Green": "#293a24", + "Blue": "#24354f", + "Violet": "#2d1942", + "Orange": "#3d3026", + "Rose": "#3d1e2b" }, "Label": { @@ -167,6 +169,8 @@ } }, + "Panel.background": "backgroundColor", + "ParameterInfo": { "background": "#3d424b", "foreground": "#abb2bf", @@ -176,6 +180,7 @@ "Plugins": { "disabledForeground": "#5c6370", + "hoverBackground": "#323844", "lightSelectionBackground": "#323844", "tagBackground": "#414855", "tagForeground": "#abb2bf", @@ -228,7 +233,7 @@ "SearchEverywhere": { "Advertiser.foreground": "#5c6370", - "Header.background": "#21252b", + "Header.background": "backgroundColor", "SearchField":{ "background": "#282c34", @@ -335,7 +340,7 @@ "VersionControl": { "Log.Commit": { - "currentBranchBackground": "#21252b", + "currentBranchBackground": "#282c35", "unmatchedForeground": "#5c6370" }, @@ -347,8 +352,13 @@ }, "WelcomeScreen": { - "Projects.selectionInactiveBackground": "#2c313a", - "separatorColor": "#2c313a" + "borderColor": "borderColor", + "Projects": { + "actions.background": "#323844", + "selectionInactiveBackground": "#2c313a" + }, + "separatorColor": "#2c313a", + "SidePanel.background": "#282c34" } }, @@ -357,9 +367,9 @@ "Checkbox.Background.Default.Dark": "#282c34", "Checkbox.Border.Default.Dark": "#414855", "Checkbox.Foreground.Selected.Dark": "#abb2bf", - "Checkbox.Focus.Wide.Dark": "accentColor", - "Checkbox.Focus.Thin.Default.Dark": "accentColor", - "Checkbox.Focus.Thin.Selected.Dark": "accentColor", + "Checkbox.Focus.Wide.Dark": "#568AF2", + "Checkbox.Focus.Thin.Default.Dark": "#568AF2", + "Checkbox.Focus.Thin.Selected.Dark": "#568AF2", "Checkbox.Background.Disabled.Dark": "#21252b", "Checkbox.Border.Disabled.Dark": "#2c313a", "Checkbox.Foreground.Disabled.Dark": "#5c6370"