diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index e894392b06..5053aa7ff1 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -117,12 +117,12 @@ Column background: Rectangle { border.width: UM.Theme.getSize("default_lining").width - border.color: control.checked ? UM.Theme.getColor("toggle_checked_border") : - control.pressed ? UM.Theme.getColor("toggle_active_border") : - control.hovered ? UM.Theme.getColor("toggle_hovered_border") : UM.Theme.getColor("toggle_unchecked_border") - color: control.checked ? UM.Theme.getColor("toggle_checked") : - control.pressed ? UM.Theme.getColor("toggle_active") : - control.hovered ? UM.Theme.getColor("toggle_hovered") : UM.Theme.getColor("toggle_unchecked") + border.color: control.checked ? UM.Theme.getColor("tab_checked_border") : + control.pressed ? UM.Theme.getColor("tab_active_border") : + control.hovered ? UM.Theme.getColor("tab_hovered_border") : UM.Theme.getColor("tab_unchecked_border") + color: control.checked ? UM.Theme.getColor("tab_checked") : + control.pressed ? UM.Theme.getColor("tab_active") : + control.hovered ? UM.Theme.getColor("tab_hovered") : UM.Theme.getColor("tab_unchecked") Behavior on color { ColorAnimation { duration: 50; } } Rectangle @@ -137,7 +137,7 @@ Column color: model.color border.width: UM.Theme.getSize("default_lining").width - border.color: UM.Theme.getColor("toggle_checked") + border.color: UM.Theme.getColor("tab_checked_border") } Label @@ -148,9 +148,9 @@ Column anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2 - color: control.checked ? UM.Theme.getColor("toggle_checked_text") : - control.pressed ? UM.Theme.getColor("toggle_active_text") : - control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text") + color: control.checked ? UM.Theme.getColor("tab_checked_text") : + control.pressed ? UM.Theme.getColor("tab_active_text") : + control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text") font: UM.Theme.getFont("default") text: control.text diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index a29aefa143..c352ca64e9 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -91,7 +91,20 @@ "toggle_hovered_text": [24, 41, 77, 255], "toggle_active": [32, 166, 219, 255], "toggle_active_border": [32, 166, 219, 255], - "toggle_active_text": [255, 255, 255, 255], + "toggle_active_text": [24, 41, 77, 255], + + "tab_checked": [255, 255, 255, 255], + "tab_checked_border": [24, 41, 77, 255], + "tab_checked_text": [24, 41, 77, 255], + "tab_unchecked": [224, 224, 224, 255], + "tab_unchecked_border": [224, 224, 224, 255], + "tab_unchecked_text": [24, 41, 77, 255], + "tab_hovered": [240, 240, 240, 255], + "tab_hovered_border": [128, 128, 128, 255], + "tab_hovered_text": [24, 41, 77, 255], + "tab_active": [255, 255, 255, 255], + "tab_active_border": [24, 41, 77, 255], + "tab_active_text": [24, 41, 77, 255], "action_button": [255, 255, 255, 255], "action_button_text": [24, 41, 77, 255],