3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Let Tertiary button have its own hover entry.

Browse source 
Secondary button entries should not be re-used here.

part of CURA-8012
This commit is contained in:
Remco Burema 2021-07-06 09:37:48 +02:00
parent a42fee4834
commit acf3f2d02a
No known key found for this signature in database
GPG key ID: 215C49431D43F98C
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/TertiaryButton.qml
View file

@ -15,5 +15,5 @@ Cura.ActionButton
outlineDisabledColor: "transparent" outlineDisabledColor: "transparent"
disabledColor: "transparent" disabledColor: "transparent"
textDisabledColor: UM.Theme.getColor("action_button_disabled_text") textDisabledColor: UM.Theme.getColor("action_button_disabled_text")
hoverColor: UM.Theme.getColor("secondary_button_hover") hoverColor: UM.Theme.getColor("tertiary_button_hover")
} }

2
resources/themes/cura-dark/theme.json
View file

@ -20,6 +20,8 @@
"secondary_button_hover": [85, 85, 87, 255], "secondary_button_hover": [85, 85, 87, 255],
"secondary_button_text": [255, 255, 255, 255], "secondary_button_text": [255, 255, 255, 255],
"tertiary_button_hover": [85, 85, 87, 255],
"icon": [255, 255, 255, 255], "icon": [255, 255, 255, 255],
"toolbar_background": [39, 44, 48, 255], "toolbar_background": [39, 44, 48, 255],
"toolbar_button_active": [57, 57, 58, 255], "toolbar_button_active": [57, 57, 58, 255],

2
resources/themes/cura-light/theme.json
View file

@ -178,6 +178,8 @@
"secondary_button_hover": [232, 240, 253, 255], "secondary_button_hover": [232, 240, 253, 255],
"secondary_button_text": [25, 110, 240, 255], "secondary_button_text": [25, 110, 240, 255],
"tertiary_button_hover": [232, 240, 253, 255],
"main_window_header_background": [8, 7, 63, 255], "main_window_header_background": [8, 7, 63, 255],
"main_window_header_background_gradient": [25, 23, 91, 255], "main_window_header_background_gradient": [25, 23, 91, 255],
"main_window_header_button_text_active": [8, 7, 63, 255], "main_window_header_button_text_active": [8, 7, 63, 255],