From 6dd6f5ecc7ec6be44cd293b27925ad66771d18fa Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 15 Nov 2018 14:11:46 +0100 Subject: [PATCH] Made the hardcoded values of ExpandableComponent themable CURA-5785 --- resources/qml/ExpandableComponent.qml | 6 +++--- resources/themes/cura-light/theme.json | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/qml/ExpandableComponent.qml b/resources/qml/ExpandableComponent.qml index e110ed94be..9464a8f0ac 100644 --- a/resources/qml/ExpandableComponent.qml +++ b/resources/qml/ExpandableComponent.qml @@ -17,10 +17,10 @@ Item property var popupItem // The background color of the popup - property color popupBackgroundColor: "white" + property color popupBackgroundColor: UM.Theme.getColor("action_button") - property color headerBackgroundColor: "white" - property color headerHoverColor: "white" + property color headerBackgroundColor: UM.Theme.getColor("action_button") + property color headerHoverColor: UM.Theme.getColor("action_button_hovered") // How much spacing is needed around the popupItem property alias popupPadding: popup.padding diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index a36940641e..d28611529b 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -75,6 +75,7 @@ "lining": [192, 193, 194, 255], "viewport_overlay": [0, 0, 0, 192], + "primary": [50, 130, 255, 255], "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], @@ -157,7 +158,7 @@ "action_button": [255, 255, 255, 255], "action_button_text": [0, 0, 0, 255], "action_button_border": [127, 127, 127, 255], - "action_button_hovered": [255, 255, 255, 255], + "action_button_hovered": [232, 242, 252, 255], "action_button_hovered_text": [31, 36, 39, 255], "action_button_hovered_border": [50, 130, 255, 255], "action_button_active": [255, 255, 255, 255],