Fix some other merge conflicts

Contributes to CURA-6008.
This commit is contained in:
Diego Prado Gesto 2018-12-07 13:29:16 +01:00
parent 46fa33fda5
commit 26be65e405
4 changed files with 47 additions and 40 deletions

View file

@ -109,10 +109,9 @@ Item
}
source: UM.Theme.getIcon("pencil")
visible: source != "" && base.enabled
// color: UM.Theme.getColor("small_button_text")
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
color: UM.Theme.getColor("text")
color: UM.Theme.getColor("small_button_text")
}
MouseArea