Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-09 16:25:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accent color:

Browse Source 
- added @accentXYZ variables that define all blueish accent colors
- all blueish accent colors are calculated based on @accentColor

(issue #233)
This commit is contained in:
Karl Tauber
2021-08-06 22:52:23 +02:00
parent dd14843f2e
commit 9144b7206e
7 changed files with 114 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -34,7 +34,7 @@
@background = #3c3f41
@foreground = #bbb
@selectionBackground = #4B6EAF
@selectionBackground = @accentSelectionBackground
@selectionForeground = @foreground
@selectionInactiveBackground =spin(saturate(shade(@selectionBackground,70%),20%),-15)
@selectionInactiveForeground = @foreground
@@ -48,6 +48,15 @@
@cellFocusColor = #000
@icon = #adadad
# accent colors (blueish)
@accentColor = #4B6EAF
@accentFocusColor = shade(spin(@accentColor,-8),20%)
@accentLinkColor = lighten(saturate(spin(@accentColor,-5),50%),16%)
@accentSelectionBackground = @accentColor
@accentSliderColor = @accentUnderlineColor
@accentUnderlineColor = lighten(saturate(spin(@accentColor,-8),13%),5%)
@accentButtonDefaultBackground = darken(spin(@accentColor,-8),13%)
# for buttons within components (e.g. combobox or spinner)
@buttonArrowColor = #9A9DA1
@buttonDisabledArrowColor = darken(@buttonArrowColor,25%)
@@ -86,7 +95,7 @@ Button.hoverBorderColor = $Button.focusedBorderColor
Button.innerFocusWidth = 1
Button.default.background = #365880
Button.default.background = @accentButtonDefaultBackground
Button.default.foreground = @foreground
Button.default.hoverBackground = lighten($Button.default.background,3%,derived)
Button.default.pressedBackground = lighten($Button.default.background,6%,derived)
@@ -148,8 +157,8 @@ ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
Component.borderColor = #646464
Component.disabledBorderColor = $Component.borderColor
Component.focusedBorderColor = lighten($Component.focusColor,5%)
Component.focusColor = #3d6185
Component.linkColor = #589df6
Component.focusColor = @accentFocusColor
Component.linkColor = @accentLinkColor
Component.grayFilter = -20,-70,100
Component.error.borderColor = desaturate($Component.error.focusedBorderColor,25%)
@@ -226,7 +235,7 @@ PopupMenu.borderColor = #5e5e5e
#---- ProgressBar ----
ProgressBar.background = #555
ProgressBar.foreground = #4A88C7
ProgressBar.foreground = @accentSliderColor
ProgressBar.selectionForeground = @foreground
ProgressBar.selectionBackground = @foreground
@@ -255,7 +264,7 @@ Separator.foreground = #515151
#---- Slider ----
Slider.trackValueColor = #4A88C7
Slider.trackValueColor = @accentSliderColor
Slider.trackColor = #646464
Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor = #888
@@ -273,7 +282,7 @@ SplitPaneDivider.draggingColor = #646464
#---- TabbedPane ----
TabbedPane.underlineColor = #4A88C7
TabbedPane.underlineColor = @accentUnderlineColor
TabbedPane.disabledUnderlineColor = #7a7a7a
TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse)
TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,25%)

7
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
View File

@@ -31,11 +31,16 @@
# which is licensed under the Apache 2.0 license. Copyright 2000-2019 JetBrains s.r.o.
# See: https://github.com/JetBrains/intellij-community/
#---- variables ----
# accent colors (blueish)
@accentButtonDefaultBackground = tint(@accentColor,15%)
#---- Button ----
Button.focusedBackground = null
Button.default.background = #4D8AC9
Button.default.background = @accentButtonDefaultBackground
Button.default.foreground = #fff
Button.default.focusedBackground = null
Button.default.borderColor = shade($Button.default.background,15%)

31
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -34,7 +34,7 @@
@background = #f2f2f2
@foreground = #000
@selectionBackground = #2675BF
@selectionBackground = @accentSelectionBackground
@selectionForeground = #fff
@selectionInactiveBackground = #d4d4d4
@selectionInactiveForeground = @foreground
@@ -48,6 +48,15 @@
@cellFocusColor = #000
@icon = #afafaf
# accent colors (blueish)
@accentColor = #2675BF
@accentCheckmarkColor = tint(@accentSliderColor,20%)
@accentFocusColor = lighten(@accentColor,31%)
@accentLinkColor = darken(@accentColor,3%)
@accentSelectionBackground = @accentColor
@accentSliderColor = lighten(saturate(@accentColor,10%),6%)
@accentUnderlineColor = tint(@accentColor,10%)
# for buttons within components (e.g. combobox or spinner)
@buttonArrowColor = #666
@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%)
@@ -92,7 +101,7 @@ Button.default.foreground = @foreground
Button.default.focusedBackground = $Button.focusedBackground
Button.default.hoverBackground = darken($Button.default.background,3%,derived)
Button.default.pressedBackground = darken($Button.default.background,10%,derived)
Button.default.borderColor = #4F9EE3
Button.default.borderColor = @accentCheckmarkColor
Button.default.hoverBorderColor = $Button.hoverBorderColor
Button.default.focusedBorderColor = $Button.focusedBorderColor
Button.default.focusColor = $Component.focusColor
@@ -110,7 +119,7 @@ CheckBox.icon.borderColor = #b0b0b0
CheckBox.icon.background = #fff
CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
CheckBox.icon.selectedBackground = $CheckBox.icon.background
CheckBox.icon.checkmarkColor = #4F9EE3
CheckBox.icon.checkmarkColor = @accentCheckmarkColor
# disabled
CheckBox.icon.disabledBorderColor = #BDBDBD
@@ -132,7 +141,7 @@ CheckBox.icon.pressedBackground = $Button.pressedBackground
# used if CheckBox.icon.style = filled
# enabled
CheckBox.icon[filled].selectedBorderColor = shade($CheckBox.icon[filled].selectedBackground,5%)
CheckBox.icon[filled].selectedBackground = #4F9EE3
CheckBox.icon[filled].selectedBackground = @accentCheckmarkColor
CheckBox.icon[filled].checkmarkColor = #fff
# focused
CheckBox.icon[filled].selectedFocusedBorderColor = tint($CheckBox.icon[filled].selectedBackground,50%)
@@ -154,8 +163,8 @@ ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
Component.borderColor = #c4c4c4
Component.disabledBorderColor = lighten($Component.borderColor,4%)
Component.focusedBorderColor = shade($Component.focusColor,10%)
Component.focusColor = #97c3f3
Component.linkColor = #2470B3
Component.focusColor = @accentFocusColor
Component.linkColor = @accentLinkColor
Component.grayFilter = 25,-25,100
Component.error.borderColor = lighten(desaturate($Component.error.focusedBorderColor,20%),25%)
@@ -177,7 +186,7 @@ DesktopIcon.background = darken($Desktop.background,10%,derived)
#---- HelpButton ----
HelpButton.questionMarkColor = #4F9EE3
HelpButton.questionMarkColor = @accentCheckmarkColor
#---- InternalFrame ----
@@ -214,7 +223,7 @@ MenuBar.borderColor = #cdcdcd
#---- MenuItemCheckBox ----
MenuItemCheckBox.icon.checkmarkColor = #4F9EE3
MenuItemCheckBox.icon.checkmarkColor = @accentCheckmarkColor
MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB
@@ -237,7 +246,7 @@ PopupMenu.borderColor = #adadad
#---- ProgressBar ----
ProgressBar.background = #D1D1D1
ProgressBar.foreground = #1E82E6
ProgressBar.foreground = @accentSliderColor
ProgressBar.selectionForeground = @textComponentBackground
ProgressBar.selectionBackground = @foreground
@@ -266,7 +275,7 @@ Separator.foreground = #d1d1d1
#---- Slider ----
Slider.trackValueColor = #1E82E6
Slider.trackValueColor = @accentSliderColor
Slider.trackColor = #c4c4c4
Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor = #888
@@ -284,7 +293,7 @@ SplitPaneDivider.draggingColor = #c4c4c4
#---- TabbedPane ----
TabbedPane.underlineColor = #4083C9
TabbedPane.underlineColor = @accentUnderlineColor
TabbedPane.disabledUnderlineColor = #ababab
TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived)
TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,10%)