From ac907ca4518dc34c7c452f384ad8ef081e6a2320 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 1 Mar 2022 12:33:19 +0100 Subject: [PATCH] Update highlight colors CURA-8688 --- resources/qml/ExpandableComponent.qml | 4 ++-- resources/qml/ExpandableComponentHeader.qml | 3 +-- resources/qml/ExpandablePopup.qml | 4 ++-- resources/themes/cura-dark/theme.json | 3 +++ resources/themes/cura-light/theme.json | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index 8821bcbb98..e5eab3bd93 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -30,8 +30,8 @@ Item property color contentBackgroundColor: UM.Theme.getColor("action_button") property color headerBackgroundColor: UM.Theme.getColor("action_button") - property color headerActiveColor: UM.Theme.getColor("secondary") - property color headerHoverColor: UM.Theme.getColor("action_button_hovered") + property color headerActiveColor: UM.Theme.getColor("expandable_active") + property color headerHoverColor: UM.Theme.getColor("expandable_hover") property alias enabled: mouseArea.enabled diff --git a/resources/qml/ExpandableComponentHeader.qml b/resources/qml/ExpandableComponentHeader.qml index 831267acbe..7176f0978b 100644 --- a/resources/qml/ExpandableComponentHeader.qml +++ b/resources/qml/ExpandableComponentHeader.qml @@ -16,7 +16,7 @@ Cura.RoundedRectangle property alias xPosCloseButton: closeButton.left height: UM.Theme.getSize("expandable_component_content_header").height - color: UM.Theme.getColor("secondary") + color: UM.Theme.getColor("background_1") cornerSide: Cura.RoundedRectangle.Direction.Up border.width: UM.Theme.getSize("default_lining").width border.color: UM.Theme.getColor("lining") @@ -27,7 +27,6 @@ Cura.RoundedRectangle id: headerLabel text: "" font: UM.Theme.getFont("medium") - color: UM.Theme.getColor("small_button_text") height: parent.height anchors diff --git a/resources/qml/ExpandablePopup.qml b/resources/qml/ExpandablePopup.qml index 4e9393b086..219608a762 100644 --- a/resources/qml/ExpandablePopup.qml +++ b/resources/qml/ExpandablePopup.qml @@ -30,8 +30,8 @@ Item property color contentBackgroundColor: UM.Theme.getColor("action_button") property color headerBackgroundColor: UM.Theme.getColor("action_button") - property color headerActiveColor: UM.Theme.getColor("secondary") - property color headerHoverColor: UM.Theme.getColor("action_button_hovered") + property color headerActiveColor: UM.Theme.getColor("expandable_active") + property color headerHoverColor: UM.Theme.getColor("expandable_hover") property alias mouseArea: headerMouseArea property alias enabled: headerMouseArea.enabled diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 31803bbddb..c111ccf350 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -39,6 +39,9 @@ "primary_text": "text_default", "secondary": [95, 95, 95, 255], + "expandable_active": "background_2", + "expandable_hover": "background_2", + "secondary_button": "background_1", "secondary_button_hover": "background_3", "secondary_button_text": [255, 255, 255, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index e01c0363fa..a959a17d0c 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -208,6 +208,9 @@ "border_field": [180, 180, 180, 255], "secondary": [240, 240, 240, 255], + "expandable_active": [240, 240, 240, 255], + "expandable_hover": [232, 242, 252, 255], + "icon": [8, 7, 63, 255], "primary_button": "accent_1",