diff --git a/CHANGELOG.md b/CHANGELOG.md index b2986de3..a3d75adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ FlatLaf Change Log ## Unreleased +- Updated colors in "Flat Light" and "Flat IntelliJ" themes with colors from + "IntelliJ Light Theme", which provides blue coloring that better match + platform colors. - Fixed link color (in HTML text) and separator color in IntelliJ platform themes. diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index 241112aa..c6ca1f4d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -190,7 +190,7 @@ SplitPaneDivider.oneTouchHoverArrowColor=#7A7D81 #---- TabbedPane ---- -TabbedPane.disabledForeground=#777777 +TabbedPane.disabledForeground=@disabledText TabbedPane.underlineColor=#4A88C7 TabbedPane.disabledUnderlineColor=#7a7a7a TabbedPane.hoverColor=#2e3133 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties index 6fb72e06..9268326b 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties @@ -22,21 +22,22 @@ Button.focusedBackground=null -Button.default.background=#4A86C7 -Button.default.foreground=#f0f0f0 +Button.default.background=#4D8AC9 +Button.default.foreground=#FFFFFF Button.default.focusedBackground=null -Button.default.borderColor=#3167ad -Button.default.hoverBorderColor=#a8cef6 -Button.default.focusedBorderColor=#a8cef6 +Button.default.borderColor=#3D75B2 +Button.default.hoverBorderColor=#A9C9F5 +Button.default.focusedBorderColor=#A9C9F5 Button.default.focusColor=#97c3f3 Button.default.boldText=true +Button.default.borderWidth=1 #---- CheckBox ---- -CheckBox.icon.selectedBorderColor=#4982CC +CheckBox.icon.selectedBorderColor=#4B97D9 CheckBox.icon.selectedFocusedBorderColor=#ACCFF7 -CheckBox.icon.selectedBackground=#4D89C9 +CheckBox.icon.selectedBackground=#4F9EE3 CheckBox.icon.checkmarkColor=#FFFFFF CheckBox.icon.selectedHoverBackground=#5E94CE diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index c372f7a6..368b6ff3 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -22,11 +22,11 @@ @background=#f2f2f2 @foreground=#000000 -@selectionBackground=#4A6EB7 +@selectionBackground=#2675BF @selectionForeground=#ffffff @selectionInactiveBackground=#d4d4d4 @selectionInactiveForeground=@foreground -@disabledText=#999999 +@disabledText=#8C8C8C @textComponentBackground=#ffffff @cellFocusColor=#000000 @icon=#afafaf @@ -44,7 +44,7 @@ *.textForeground=@foreground *.caretForeground=@foreground *.inactiveBackground=@background -*.inactiveForeground=#777777 +*.inactiveForeground=@disabledText *.selectionBackground=@selectionBackground *.selectionForeground=@selectionForeground *.disabledBackground=@background @@ -71,9 +71,9 @@ Button.focusedBackground=#e3f1fa Button.hoverBackground=@buttonHoverBackground Button.pressedBackground=@buttonPressedBackground -Button.borderColor=#bfbfbf -Button.disabledBorderColor=#cfcfcf -Button.focusedBorderColor=#87afda +Button.borderColor=@@Component.borderColor +Button.disabledBorderColor=@@Component.disabledBorderColor +Button.focusedBorderColor=@@Component.focusedBorderColor Button.hoverBorderColor=@@Button.focusedBorderColor Button.default.background=@@Button.background @@ -81,7 +81,7 @@ Button.default.foreground=@foreground Button.default.focusedBackground=@@Button.focusedBackground Button.default.hoverBackground=@buttonHoverBackground Button.default.pressedBackground=@buttonPressedBackground -Button.default.borderColor=#4D89C9 +Button.default.borderColor=#4F9EE3 Button.default.hoverBorderColor=@@Button.hoverBorderColor Button.default.focusedBorderColor=@@Button.focusedBorderColor Button.default.focusColor=@@Component.focusColor @@ -93,9 +93,9 @@ Button.toolbar.pressedBackground=#d8d8d8 #---- CheckBox ---- -CheckBox.icon.borderColor=#878787 +CheckBox.icon.borderColor=#b0b0b0 CheckBox.icon.disabledBorderColor=#BDBDBD -CheckBox.icon.selectedBorderColor=#878787 +CheckBox.icon.selectedBorderColor=@@CheckBox.icon.borderColor CheckBox.icon.focusedBorderColor=#7B9FC7 CheckBox.icon.hoverBorderColor=@@CheckBox.icon.focusedBorderColor CheckBox.icon.background=#FFFFFF @@ -104,7 +104,7 @@ CheckBox.icon.focusedBackground=@@Button.focusedBackground CheckBox.icon.hoverBackground=@buttonHoverBackground CheckBox.icon.pressedBackground=@buttonPressedBackground CheckBox.icon.selectedBackground=#FFFFFF -CheckBox.icon.checkmarkColor=#4D89C9 +CheckBox.icon.checkmarkColor=#4F9EE3 CheckBox.icon.disabledCheckmarkColor=#ABABAB @@ -124,12 +124,12 @@ Component.borderColor=#c4c4c4 Component.disabledBorderColor=#cfcfcf Component.focusedBorderColor=#87afda Component.focusColor=#97c3f3 -Component.linkColor=#4a78c2 +Component.linkColor=#2470B3 #---- HelpButton ---- -HelpButton.questionMarkColor=#4D89C9 +HelpButton.questionMarkColor=#4F9EE3 #---- List ---- @@ -150,19 +150,19 @@ MenuBar.borderColor=#cdcdcd #---- MenuItemCheckBox ---- -MenuItemCheckBox.icon.checkmarkColor=#4D89C9 +MenuItemCheckBox.icon.checkmarkColor=#4F9EE3 MenuItemCheckBox.icon.disabledCheckmarkColor=#ABABAB #---- PopupMenu ---- -PopupMenu.borderColor=#cdcdcd +PopupMenu.borderColor=#adadad #---- ProgressBar ---- -ProgressBar.background=#c4c4c4 -ProgressBar.foreground=#808080 +ProgressBar.background=#D1D1D1 +ProgressBar.foreground=#1E82E6 ProgressBar.selectionForeground=@textComponentBackground ProgressBar.selectionBackground=@foreground @@ -177,7 +177,7 @@ ScrollBar.hoverThumbColor=#c6c6c6 #---- Separator ---- -Separator.foreground=#cdcdcd +Separator.foreground=#d1d1d1 #---- Slider ---- @@ -197,7 +197,7 @@ SplitPaneDivider.oneTouchHoverArrowColor=#333333 #---- TabbedPane ---- -TabbedPane.disabledForeground=#999999 +TabbedPane.disabledForeground=@disabledText TabbedPane.underlineColor=#4083C9 TabbedPane.disabledUnderlineColor=#ababab TabbedPane.hoverColor=#d9d9d9 diff --git a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties index b04a6797..4bee107c 100644 --- a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties +++ b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties @@ -28,7 +28,7 @@ JXHeader.startBackground=#ffffff #---- Hyperlink ---- -Hyperlink.linkColor=#4a78c2 +Hyperlink.linkColor=@@Component.linkColor Hyperlink.visitedColor=@@Hyperlink.linkColor Hyperlink.disabledText=@disabledText