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

Fix merge conflict

Browse Source 
Oopsie.
This commit is contained in:
Ghostkeeper 2021-05-04 17:08:44 +02:00
parent 08976dcc7e
commit 7f1e61b7b8
No known key found for this signature in database
GPG Key ID: 14C3586CD2EFC5B9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/themes/cura-light/styles.qml
View File

@ -75,13 +75,8 @@ QtObject
width: UM.Theme.getSize("standard_arrow").width width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height height: UM.Theme.getSize("standard_arrow").height
sourceSize.height: width sourceSize.height: width
<<<<<<< HEAD
color: control.enabled ? Theme.getColor("setting_control_button") : Theme.getColor("setting_category_disabled_text")
source: Theme.getIcon("ChevronSingleDown")
=======
color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text")
source: UM.Theme.getIcon("arrow_bottom") source: UM.Theme.getIcon("ChevronSingleDown")
>>>>>>> 4.9
} }
Label Label
{ {