From 1eb16c0ec558ed012c7db1a98cdaf78e7abecbeb Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 4 Mar 2022 13:53:59 +0100 Subject: [PATCH] Update SettingTextField to match TextField CURA-8991 --- resources/qml/Settings/SettingTextField.qml | 10 +++++----- resources/themes/cura-light/theme.json | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 7aacad21da..68d206b96c 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -36,7 +36,7 @@ SettingItem { if(!enabled) { - return UM.Theme.getColor("setting_control_disabled_border") + return UM.Theme.getColor("text_field_border_disabled") } switch(propertyProvider.properties.validationState) { @@ -52,15 +52,15 @@ SettingItem //Validation is OK. if(hovered || input.activeFocus) { - return UM.Theme.getColor("border_main") + return UM.Theme.getColor("text_field_border_hovered") } - return UM.Theme.getColor("border_field_light") + return UM.Theme.getColor("text_field_border") } color: { if(!enabled) { - return UM.Theme.getColor("setting_control_disabled") + return UM.Theme.getColor("text_field") } switch(propertyProvider.properties.validationState) { @@ -76,7 +76,7 @@ SettingItem return UM.Theme.getColor("setting_validation_ok") default: - return UM.Theme.getColor("setting_control") + return UM.Theme.getColor("text_field") } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 9569ccfc53..5adb140802 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -355,8 +355,6 @@ "text_field_text": "text_default", "text_field_text_disabled": "text_disabled", - - "category_background": "background_2", "tooltip": [25, 25, 25, 255],