Change the colors to match the designs.

Contributes to CURA-5941.

resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml

@@ -25,7 +25,7 @@ Item
     {
         id: header
         height: UM.Theme.getSize("print_setup_widget_header").height
-        color: UM.Theme.getColor("action_button_hovered")  // TODO: It's not clear the color that we need to use here
+        color: UM.Theme.getColor("secondary")
 
         anchors
         {
@@ -46,9 +46,9 @@ Item
 
             anchors
             {
-                topMargin: UM.Theme.getSize("sidebar_margin").height
+                topMargin: UM.Theme.getSize("default_margin").height
                 left: parent.left
-                leftMargin: UM.Theme.getSize("narrow_margin").height
+                leftMargin: UM.Theme.getSize("default_margin").height
             }
         }
 

resources/qml/Settings/SettingCategory.qml

@@ -45,32 +45,6 @@ Button
             return UM.Theme.getColor("setting_category")
         }
         Behavior on color { ColorAnimation { duration: 50; } }
-        Rectangle
-        {
-            id: backgroundLiningRectangle
-            height: UM.Theme.getSize("default_lining").height
-            width: parent.width
-            anchors.bottom: parent.bottom
-            color:
-            {
-                if (!base.enabled)
-                {
-                    return UM.Theme.getColor("setting_category_disabled_border")
-                } else if ((base.hovered || base.activeFocus) && base.checkable && base.checked)
-                {
-                    return UM.Theme.getColor("setting_category_active_hover_border")
-                } else if (base.pressed || (base.checkable && base.checked))
-                {
-                    return UM.Theme.getColor("setting_category_active_border")
-                } else if (base.hovered || base.activeFocus)
-                {
-                    return UM.Theme.getColor("setting_category_hover_border")
-                } else
-                {
-                    return UM.Theme.getColor("setting_category_border")
-                }
-            }
-        }
     }
 
     signal showTooltip(string text)

resources/themes/cura-light/styles.qml

@@ -393,7 +393,7 @@ QtObject
                 implicitWidth: Theme.getSize("scrollbar").width
                 radius: Math.round(implicitWidth / 2)
 
-                color: styleData.pressed ? Theme.getColor("scrollbar_handle_down") : styleData.hovered ? Theme.getColor("scrollbar_handle_hover") : Theme.getColor("scrollbar_handle");
+                color: styleData.pressed ? Theme.getColor("scrollbar_handle_down") : styleData.hovered ? Theme.getColor("scrollbar_handle_hover") : Theme.getColor("scrollbar_handle")
                 Behavior on color { ColorAnimation { duration: 50; } }
             }
         }

resources/themes/cura-light/theme.json

@@ -86,7 +86,7 @@
         "primary_hover": [48, 182, 231, 255],
         "primary_text": [255, 255, 255, 255],
         "border": [127, 127, 127, 255],
-        "secondary": [240, 240, 240, 255],
+        "secondary": [245, 245, 245, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
         "primary_button": [38, 113, 231, 255],
@@ -183,25 +183,25 @@
         "action_button_disabled_shadow": [228, 228, 228, 255],
 
         "scrollbar_background": [255, 255, 255, 255],
-        "scrollbar_handle": [31, 36, 39, 255],
-        "scrollbar_handle_hover": [12, 159, 227, 255],
-        "scrollbar_handle_down": [12, 159, 227, 255],
+        "scrollbar_handle": [10, 8, 80, 255],
+        "scrollbar_handle_hover": [50, 130, 255, 255],
+        "scrollbar_handle_down": [50, 130, 255, 255],
 
         "setting_category": [245, 245, 245, 255],
         "setting_category_disabled": [255, 255, 255, 255],
-        "setting_category_hover": [245, 245, 245, 255],
+        "setting_category_hover": [232, 242, 252, 255],
         "setting_category_active": [245, 245, 245, 255],
-        "setting_category_active_hover": [245, 245, 245, 255],
-        "setting_category_text": [31, 36, 39, 255],
+        "setting_category_active_hover": [232, 242, 252, 255],
+        "setting_category_text": [35, 35, 35, 255],
         "setting_category_disabled_text": [24, 41, 77, 101],
-        "setting_category_hover_text": [31, 36, 39, 255],
-        "setting_category_active_text": [31, 36, 39, 255],
-        "setting_category_active_hover_text": [31, 36, 39, 255],
+        "setting_category_hover_text": [35, 35, 35, 255],
+        "setting_category_active_text": [35, 35, 35, 255],
+        "setting_category_active_hover_text": [35, 35, 35, 255],
         "setting_category_border": [245, 245, 245, 255],
         "setting_category_disabled_border": [245, 245, 245, 255],
-        "setting_category_hover_border": [12, 159, 227, 255],
-        "setting_category_active_border": [245, 245, 245, 255],
-        "setting_category_active_hover_border": [12, 159, 227, 255],
+        "setting_category_hover_border": [50, 130, 255, 255],
+        "setting_category_active_border": [50, 130, 255, 255],
+        "setting_category_active_hover_border": [50, 130, 255, 255],
 
         "setting_control": [255, 255, 255, 255],
         "setting_control_selected": [31, 36, 39, 255],
@@ -298,16 +298,16 @@
         "xray_error": [255,  0,  0, 255],
 
         "layerview_ghost": [32, 32, 32, 96],
-        "layerview_none": [255,  255,  255, 255],
-        "layerview_inset_0": [255,  0,  0, 255],
-        "layerview_inset_x": [0,  255,  0, 255],
-        "layerview_skin": [255,  255,  0, 255],
-        "layerview_support": [0,  255,  255, 255],
-        "layerview_skirt": [0,  255,  255, 255],
-        "layerview_infill": [255,  192, 0, 255],
-        "layerview_support_infill": [0,  255,  255, 255],
-        "layerview_move_combing": [0,  0,  255, 255],
-        "layerview_move_retraction": [128,  128,  255, 255],
+        "layerview_none": [255, 255, 255, 255],
+        "layerview_inset_0": [255, 0, 0, 255],
+        "layerview_inset_x": [0, 255, 0, 255],
+        "layerview_skin": [255, 255, 0, 255],
+        "layerview_support": [0, 255, 255, 255],
+        "layerview_skirt": [0, 255, 255, 255],
+        "layerview_infill": [255, 192, 0, 255],
+        "layerview_support_infill": [0, 255, 255, 255],
+        "layerview_move_combing": [0, 0, 255, 255],
+        "layerview_move_retraction": [128, 128, 255, 255],
         "layerview_support_interface": [64, 192, 255, 255],
         "layerview_nozzle": [181, 166, 66, 50],