Fix some other merge conflicts

Contributes to CURA-6008.

resources/qml/ExpandableComponent.qml

@@ -109,10 +109,9 @@ Item
             }
             source: UM.Theme.getIcon("pencil")
             visible: source != "" && base.enabled
-//            color: UM.Theme.getColor("small_button_text")
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
-            color: UM.Theme.getColor("text")
+            color: UM.Theme.getColor("small_button_text")
         }
 
         MouseArea

resources/qml/ExpandablePopup.qml

@@ -131,7 +131,7 @@ Item
             visible: source != "" && base.enabled
             width: UM.Theme.getSize("standard_arrow").width
             height: UM.Theme.getSize("standard_arrow").height
-            color: UM.Theme.getColor("text")
+            color: UM.Theme.getColor("small_button_text")
         }
 
         MouseArea

resources/qml/JobSpecs.qml

@@ -80,7 +80,6 @@ Item
             height: UM.Theme.getSize("jobspecs_line").height
             width: Math.max(__contentWidth + UM.Theme.getSize("default_margin").width, 50)
             maximumLength: 120
-            property int unremovableSpacing: 5
             text: PrintInformation.jobName
             horizontalAlignment: TextInput.AlignLeft
 

resources/themes/cura-light/theme.json

@@ -35,7 +35,7 @@
             "family": "Noto Sans"
         },
         "default_italic": {
-            "size": 1.15,
+            "size": 1.0,
             "weight": 50,
             "italic": true,
             "family": "Noto Sans"
@@ -80,7 +80,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],
@@ -178,34 +178,34 @@
         "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],
         "setting_control_highlight": [255, 255, 255, 255],
-        "setting_control_border": [127, 127, 127, 255],
+        "setting_control_border": [199, 199, 199, 255],
         "setting_control_border_highlight": [50, 130, 255, 255],
-        "setting_control_text": [27, 27, 27, 255],
-        "setting_control_depth_line": [127, 127, 127, 255],
-        "setting_control_button": [127, 127, 127, 255],
+        "setting_control_text": [35, 35, 35, 255],
+        "setting_control_depth_line": [199, 199, 199, 255],
+        "setting_control_button": [199, 199, 199, 255],
         "setting_control_button_hover": [70, 84, 113, 255],
         "setting_control_disabled": [245, 245, 245, 255],
         "setting_control_disabled_text": [127, 127, 127, 255],
@@ -216,6 +216,7 @@
         "setting_validation_warning_background": [255, 145, 62, 255],
         "setting_validation_warning": [127, 127, 127, 255],
         "setting_validation_ok": [255, 255, 255, 255],
+        "setting_filter_field" : [153, 153, 153, 255],
 
         "material_compatibility_warning": [0, 0, 0, 255],
 
@@ -233,11 +234,11 @@
 
         "checkbox": [255, 255, 255, 255],
         "checkbox_hover": [255, 255, 255, 255],
-        "checkbox_border": [64, 69, 72, 255],
+        "checkbox_border": [199, 199, 199, 255],
         "checkbox_border_hover": [50, 130, 255, 255],
-        "checkbox_mark": [119, 122, 124, 255],
+        "checkbox_mark": [50, 130, 255, 255],
         "checkbox_disabled": [223, 223, 223, 255],
-        "checkbox_text": [27, 27, 27, 255],
+        "checkbox_text": [35, 35, 35, 255],
 
         "tooltip": [68, 192, 255, 255],
         "tooltip_text": [255, 255, 255, 255],
@@ -293,16 +294,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],
 
@@ -356,10 +357,16 @@
 
         "account_button": [12, 3],
 
-        "print_setup_widget": [30.0, 42.0],
+        "print_setup_widget": [38.0, 30.0],
         "print_setup_mode_toggle": [0.0, 2.0],
         "print_setup_item": [0.0, 2.0],
         "print_setup_extruder_box": [0.0, 6.0],
+        "print_setup_widget_header": [0.0, 3.0],
+        "print_setup_slider_groove": [0.16, 0.16],
+        "print_setup_slider_handle": [1.0, 1.0],
+        "print_setup_slider_tickmarks": [0.32, 0.32],
+        "print_setup_big_item": [28, 2.5],
+        "print_setup_icon": [1.2, 1.2],
 
         "configuration_selector_mode_tabs": [0.0, 3.0],
 
@@ -391,12 +398,13 @@
 
         "extruder_icon": [2.33, 2.33],
 
-        "section": [0.0, 2.2],
+        "section": [0.0, 2],
         "section_icon": [1.6, 1.6],
         "section_icon_column": [2.8, 0.0],
 
         "setting": [25.0, 1.8],
-        "setting_control": [10.0, 2.0],
+        "setting_control": [11.0, 2.0],
+        "setting_control_radius": [0.15, 0.15],
         "setting_control_depth_margin": [1.4, 0.0],
         "setting_preferences_button_margin": [4, 0.0],
         "setting_control_margin": [0.0, 0.0],
@@ -404,7 +412,7 @@
         "setting_text_maxwidth": [40.0, 0.0],
 
         "standard_list_lineheight": [1.5, 1.5],
-        "standard_arrow": [0.8, 0.8],
+        "standard_arrow": [1.0, 1.0],
 
         "button": [4, 4],
         "button_icon": [2.5, 2.5],
@@ -444,7 +452,8 @@
         "layerview_row": [11.0, 1.5],
         "layerview_row_spacing": [0.0, 0.5],
 
-        "checkbox": [2.0, 2.0],
+        "checkbox": [1.5, 1.5],
+        "checkbox_radius": [0.08, 0.08],
 
         "tooltip": [20.0, 10.0],
         "tooltip_margins": [1.0, 1.0],