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

Adjust disabled extruder colour

Browse Source 
This also introduces a more global 'disabled' colour as defined by the style guide. I hope that we can gradually transition to this one, but we'll have to adjust some colours here and there.

Contributes to issue CURA-5876.
This commit is contained in:
Ghostkeeper 2018-12-07 15:38:08 +01:00
parent 6a7bbe5bdb
commit b565b111c8
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/ExtruderIcon.qml
View File

@ -23,7 +23,7 @@ Item
anchors.fill: parent anchors.fill: parent
source: UM.Theme.getIcon("extruder_button") source: UM.Theme.getIcon("extruder_button")
color: extruderEnabled ? materialColor: "gray" color: extruderEnabled ? materialColor: UM.Theme.getColor("disabled")
} }
Rectangle Rectangle

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

@ -35,6 +35,7 @@
"text_scene_hover": [255, 255, 255, 204], "text_scene_hover": [255, 255, 255, 204],
"error": [212, 31, 53, 255], "error": [212, 31, 53, 255],
"disabled": [32, 32, 32, 255],
"button": [39, 44, 48, 255], "button": [39, 44, 48, 255],
"button_hover": [39, 44, 48, 255], "button_hover": [39, 44, 48, 255],

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

@ -129,6 +129,7 @@
"error": [255, 140, 0, 255], "error": [255, 140, 0, 255],
"warning": [245, 166, 35, 255], "warning": [245, 166, 35, 255],
"disabled": [229, 229, 229, 255],
"toolbar_button_text": [8, 7, 63, 255], "toolbar_button_text": [8, 7, 63, 255],
"toolbar_button_hover": [232, 242, 252, 255], "toolbar_button_hover": [232, 242, 252, 255],