From bb20e3307f43edc1ff53cb154d2351ddfe39e158 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 3 Jun 2021 17:25:39 +0200 Subject: [PATCH] Revert "Fix merge conflict" This reverts commit 7f1e61b7b8b6c6bb76ac5b99be8c762e1b01cd5e. These icons were renamed, but the original icons are now restored so those changes need to be reverted. Contributes to issue CURA-8267. --- resources/themes/cura-light/styles.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml index 782b8ea527..28aa352834 100755 --- a/resources/themes/cura-light/styles.qml +++ b/resources/themes/cura-light/styles.qml @@ -76,7 +76,7 @@ QtObject height: UM.Theme.getSize("standard_arrow").height sourceSize.height: width color: control.enabled ? UM.Theme.getColor("setting_control_button") : UM.Theme.getColor("setting_category_disabled_text") - source: UM.Theme.getIcon("ChevronSingleDown") + source: UM.Theme.getIcon("arrow_bottom") } Label {