GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 02:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate color for primary button.

Browse Source 
Adjust secondary button colors to account for different colors being used between light and dark themes.

CURA-8688
This commit is contained in:
j.delarago 2022-02-28 12:02:51 +01:00
parent 4871c98451
commit 83661ebd7f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/SecondaryButton.qml
View File

@ -11,7 +11,7 @@ Cura.ActionButton
{ {
color: UM.Theme.getColor("secondary_button") color: UM.Theme.getColor("secondary_button")
textColor: UM.Theme.getColor("secondary_button_text") textColor: UM.Theme.getColor("secondary_button_text")
outlineColor: UM.Theme.getColor("secondary_button_text") outlineColor: UM.Theme.getColor("border_accent_1")
disabledColor: UM.Theme.getColor("action_button_disabled") disabledColor: UM.Theme.getColor("action_button_disabled")
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("secondary_button_hover")

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

@ -56,6 +56,8 @@
"main_window_header_background_gradient": "background_4", "main_window_header_background_gradient": "background_4",
"main_window_header_button_background_hovered": [46, 46, 46, 255], "main_window_header_button_background_hovered": [46, 46, 46, 255],
"secondary_button_text": "text_secondary_button",
"account_sync_state_icon": [255, 255, 255, 204], "account_sync_state_icon": [255, 255, 255, 204],
"machine_selector_printer_icon": [204, 204, 204, 255], "machine_selector_printer_icon": [204, 204, 204, 255],

3
resources/themes/cura-light/theme.json
View File

@ -211,12 +211,11 @@
"icon": [8, 7, 63, 255], "icon": [8, 7, 63, 255],
"primary_button": [25, 110, 240, 255],
"primary_button": "accent_1", "primary_button": "accent_1",
"primary_button_hover": [16, 70, 156, 255], "primary_button_hover": [16, 70, 156, 255],
"primary_button_text": [255, 255, 255, 255], "primary_button_text": [255, 255, 255, 255],
"secondary_button": "text_default", "secondary_button": "background_1",
"secondary_button_shadow": [216, 216, 216, 255], "secondary_button_shadow": [216, 216, 216, 255],
"secondary_button_hover": [232, 240, 253, 255], "secondary_button_hover": [232, 240, 253, 255],
"secondary_button_text": "accent_1", "secondary_button_text": "accent_1",