diff --git a/resources/images/cura.png b/resources/images/cura.png index 3ea0fb5cfb..b2f304fce3 100644 Binary files a/resources/images/cura.png and b/resources/images/cura.png differ diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index e2578f3b7e..64c3e002a9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -6,42 +6,13 @@ "base_colors": { - "background_1": [ - 48, - 48, - 49, - 255 - ], - "background_2": [ - 54, - 54, - 54, - 255 - ], - "background_3": [ - 61, - 61, - 61, - 255 - ], - "background_4": [ - 58, - 58, - 58, - 255 - ], - "accent_1": [ - 89, - 175, - 123, - 255 - ], - "accent_2": [ - 58, - 114, - 80, - 255 - ], + "background_1": [31, 31, 32, 255], + "background_2": [57, 57, 58, 255], + "background_3": [85, 85, 87, 255], + "background_4": [23, 23, 23, 255], + + "accent_1": [25, 110, 240, 255], + "accent_2": [16, 70, 156, 255], "border_main": [118, 118, 119, 255], "border_accent_1": [255, 255, 255, 255], "border_accent_2": [243, 243, 243, 255], @@ -51,12 +22,7 @@ "text_disabled": [118, 118, 118, 255], "text_primary_button": [255, 255, 255, 255], "text_secondary_button": [255, 255, 255, 255], - "text_link_hover": [ - 186, - 201, - 225, - 255 - ], + "text_link_hover": [156, 195, 255, 255], "text_lighter": [243, 243, 243, 255], "um_green_1": [233, 245, 237, 255], @@ -123,73 +89,31 @@ "error": [212, 31, 53, 255], "disabled": [32, 32, 32, 255], - "button": [ - 42, - 40, - 47, - 255 - ], - "button_hover": [ - 42, - 44, - 45, - 255 - ], + + "button": [39, 44, 48, 255], + "button_hover": [39, 44, 48, 255], "button_text": "text_default", - "button_disabled": [ - 42, - 44, - 45, - 255 - ], + "button_disabled": [39, 44, 48, 255], "button_disabled_text": [255, 255, 255, 101], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], - "button_tooltip": [ - 42, - 44, - 45, - 255 - ], - "tab_checked": [ - 42, - 44, - 45, - 255 - ], + + "button_tooltip": [39, 44, 48, 255], + + "tab_checked": [39, 44, 48, 255], "tab_checked_border": [255, 255, 255, 30], "tab_checked_text": [255, 255, 255, 255], - "tab_unchecked": [ - 42, - 44, - 45, - 255 - ], + "tab_unchecked": [39, 44, 48, 255], "tab_unchecked_border": [255, 255, 255, 30], "tab_unchecked_text": [255, 255, 255, 101], - "tab_hovered": [ - 42, - 44, - 45, - 255 - ], + "tab_hovered": [39, 44, 48, 255], "tab_hovered_border": [255, 255, 255, 30], "tab_hovered_text": [255, 255, 255, 255], - "tab_active": [ - 42, - 44, - 45, - 255 - ], + "tab_active": [39, 44, 48, 255], "tab_active_border": [255, 255, 255, 30], "tab_active_text": [255, 255, 255, 255], - "tab_background": [ - 42, - 44, - 45, - 255 - ], + "tab_background": [39, 44, 48, 255], "action_button": "background_1", "action_button_text": [255, 255, 255, 200], @@ -216,12 +140,7 @@ "setting_control_selected": [34, 39, 42, 38], "setting_control_highlight": "background_3", "setting_control_border": [255, 255, 255, 38], - "setting_control_border_highlight": [ - 76, - 139, - 162, - 255 - ], + "setting_control_border_highlight": [12, 169, 227, 255], "setting_control_text": "text_default", "setting_control_button": [255, 255, 255, 127], "setting_control_button_hover": [255, 255, 255, 204], @@ -240,12 +159,7 @@ "slider_groove_border": [127, 127, 127, 255], "slider_groove_fill": [245, 245, 245, 255], "slider_handle": [255, 255, 255, 255], - "slider_handle_active": [ - 124, - 174, - 199, - 255 - ], + "slider_handle_active": [68, 192, 255, 255], "category_background": "background_3", @@ -255,27 +169,13 @@ "tool_panel_background": "background_1", "viewport_background": "background_1", - "volume_outline": [ - 76, - 139, - 162, - 128 - ], - "buildplate": [ - 157, - 169, - 182, - 255 - ], + "volume_outline": [12, 169, 227, 128], + "buildplate": [169, 169, 169, 255], "buildplate_grid_minor": [154, 154, 155, 255], "disallowed_area": [0, 0, 0, 52], - "model_selection_outline": [ - 76, - 139, - 162, - 128 - ], + + "model_selection_outline": [12, 169, 227, 255], "material_compatibility_warning": [255, 255, 255, 255], @@ -300,12 +200,7 @@ "monitor_tooltip_text": [229, 229, 229, 255], "monitor_context_menu": [67, 67, 67, 255], - "monitor_context_menu_hover": [ - 85, - 159, - 114, - 255 - ], + "monitor_context_menu_hover": [30, 102, 215, 255], "monitor_skeleton_loading": [102, 102, 102, 255], "monitor_placeholder_image": [102, 102, 102, 255], diff --git a/resources/themes/cura-light/images/logo.svg b/resources/themes/cura-light/images/logo.svg index 628594aed9..b2ee9b871d 100644 --- a/resources/themes/cura-light/images/logo.svg +++ b/resources/themes/cura-light/images/logo.svg @@ -1,119 +1,5 @@ - - - - - - - - - - - - - - - - - - + + + + + diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 260d0efcef..8f3f9076c5 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -197,66 +197,22 @@ "base_colors": { "background_1": [255, 255, 255, 255], - "background_2": [ - 230, - 238, - 244, - 255 - ], - "background_3": [ - 238, - 241, - 247, - 255 - ], - "background_4": [ - 22, - 25, - 47, - 255 - ], - "accent_1": [ - 89, - 123, - 175, - 255 - ], - "accent_2": [ - 58, - 80, - 114, - 255 - ], + "background_2": [243, 243, 243, 255], + "background_3": [232, 240, 253, 255], + "background_4": [3, 12, 66, 255], + + "accent_1": [25, 110, 240, 255], + "accent_2": [16, 70, 156, 255], "border_main": [212, 212, 212, 255], - "border_accent_1": [ - 89, - 123, - 175, - 255 - ], - "border_accent_2": [ - 58, - 80, - 114, - 255 - ], + "border_accent_1": [25, 110, 240, 255], + "border_accent_2": [16, 70, 156, 255], "border_field": [180, 180, 180, 255], "text_default": [0, 14, 26, 255], "text_disabled": [180, 180, 180, 255], "text_primary_button": [255, 255, 255, 255], - "text_secondary_button": [ - 89, - 123, - 175, - 255 - ], - "text_link_hover": [ - 58, - 80, - 114, - 255 - ], + "text_secondary_button": [25, 110, 240, 255], + "text_link_hover": [16, 70, 156, 255], "text_lighter": [108, 108, 108, 255], "um_green_1": [233, 245, 237, 255], @@ -277,122 +233,50 @@ "main_background": "background_1", "detail_background": "background_2", - "wide_lining": [ - 211, - 231, - 255, - 255 - ], + "wide_lining": [245, 245, 245, 255], "thick_lining": [180, 180, 180, 255], "lining": [192, 193, 194, 255], - "viewport_overlay": [ - 226, - 237, - 243, - 255 - ], + "viewport_overlay": [246, 246, 246, 255], "primary": "accent_1", - "primary_hover": [ - 103, - 156, - 176, - 255 - ], + "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], - "text_selection": [ - 186, - 201, - 255, - 127 - ], + "text_selection": [156, 195, 255, 127], "border": [127, 127, 127, 255], "border_field": [180, 180, 180, 255], "secondary": [240, 240, 240, 255], - "expandable_active": [ - 224, - 232, - 242, - 255 - ], + + "expandable_active": [240, 240, 240, 255], "expandable_hover": [232, 242, 252, 255], - "icon": [ - 24, - 24, - 46, - 255 - ], - "primary_button": [ - 89, - 175, - 123, - 255 - ], - "primary_button_hover": [ - 58, - 114, - 80, - 255 - ], + + "icon": [8, 7, 63, 255], + + "primary_button": "accent_1", + "primary_button_hover": [16, 70, 156, 255], "primary_button_text": [255, 255, 255, 255], "secondary_button": "background_1", "secondary_button_shadow": [216, 216, 216, 255], - "secondary_button_hover": [ - 238, - 241, - 247, - 255 - ], + "secondary_button_hover": [232, 240, 253, 255], "secondary_button_text": "accent_1", - "main_window_header_background": [ - 74, - 82, - 108, - 255 - ], + + "main_window_header_background": [8, 7, 63, 255], "main_window_header_background_gradient": [25, 23, 91, 255], - "main_window_header_button_text_active": [ - 24, - 24, - 46, - 255 - ], + "main_window_header_button_text_active": [8, 7, 63, 255], "main_window_header_button_text_inactive": [255, 255, 255, 255], "main_window_header_button_text_hovered": [255, 255, 255, 255], "main_window_header_button_background_active": [255, 255, 255, 255], "main_window_header_button_background_inactive": [255, 255, 255, 0], - "main_window_header_button_background_hovered": [ - 129, - 127, - 145, - 255 - ], - "account_widget_outline_active": [ - 86, - 84, - 108, - 255 - ], + "main_window_header_button_background_hovered": [117, 114, 159, 255], + + "account_widget_outline_active": [70, 66, 126, 255], "account_sync_state_icon": [25, 25, 25, 255], - "machine_selector_printer_icon": [ - 24, - 24, - 46, - 255 - ], - "action_panel_secondary": [ - 89, - 175, - 123, - 255 - ], - "first_run_shadow": [ - 111, - 111, - 193, - 255 - ], + + "machine_selector_printer_icon": [8, 7, 63, 255], + + "action_panel_secondary": "accent_1", + + "first_run_shadow": [50, 50, 50, 255], "toolbar_background": [255, 255, 255, 255], @@ -436,24 +320,9 @@ "action_button_shadow": [223, 223, 223, 255], "scrollbar_background": [255, 255, 255, 255], - "scrollbar_handle": [ - 30, - 30, - 58, - 255 - ], - "scrollbar_handle_hover": [ - 111, - 143, - 193, - 255 - ], - "scrollbar_handle_down": [ - 111, - 143, - 193, - 255 - ], + "scrollbar_handle": [10, 8, 80, 255], + "scrollbar_handle_hover": [50, 130, 255, 255], + "scrollbar_handle_down": [50, 130, 255, 255], "setting_category": "background_1", "setting_category_disabled": [255, 255, 255, 255], @@ -465,20 +334,10 @@ "setting_control": "background_2", "setting_control_highlight": "background_3", "setting_control_border": [199, 199, 199, 255], - "setting_control_border_highlight": [ - 111, - 143, - 193, - 255 - ], + "setting_control_border_highlight": [50, 130, 255, 255], "setting_control_text": [35, 35, 35, 255], "setting_control_button": [102, 102, 102, 255], - "setting_control_button_hover": [ - 24, - 24, - 46, - 255 - ], + "setting_control_button_hover": [8, 7, 63, 255], "setting_control_disabled": "background_2", "setting_control_disabled_text": [127, 127, 127, 255], "setting_control_disabled_border": [127, 127, 127, 255], @@ -492,22 +351,12 @@ "material_compatibility_warning": [243, 166, 59, 255], "progressbar_background": [245, 245, 245, 255], - "progressbar_control": [ - 136, - 148, - 168, - 255 - ], + "progressbar_control": [50, 130, 255, 255], "slider_groove": [223, 223, 223, 255], "slider_groove_fill": [8, 7, 63, 255], "slider_handle": [8, 7, 63, 255], - "slider_handle_active": [ - 111, - 143, - 193, - 255 - ], + "slider_handle_active": [50, 130, 255, 255], "slider_text_background": [255, 255, 255, 255], "quality_slider_unavailable": [179, 179, 179, 255], @@ -559,12 +408,7 @@ "message_close": [102, 102, 102, 255], "message_close_hover": [8, 7, 63, 255], "message_progressbar_background": [245, 245, 245, 255], - "message_progressbar_control": [ - 111, - 143, - 193, - 255 - ], + "message_progressbar_control": [50, 130, 255, 255], "message_success_icon": [255, 255, 255, 255], "message_warning_icon": [0, 0, 0, 255], "message_error_icon": [255, 255, 255, 255], @@ -573,53 +417,19 @@ "status_offline": [0, 0, 0, 255], "status_ready": [0, 205, 0, 255], - "status_busy": [ - 111, - 143, - 193, - 255 - ], + "status_busy": [50, 130, 255, 255], "status_paused": [255, 140, 0, 255], "status_stopped": [236, 82, 80, 255], "disabled_axis": [127, 127, 127, 255], - "x_axis": [ - 162, - 86, - 90, - 255 - ], - "y_axis": [ - 89, - 123, - 175, - 255 - ], - "z_axis": [ - 74, - 124, - 89, - 255 - ], + "x_axis": [218, 30, 40, 255], + "y_axis": [25, 110, 240, 255], + "z_axis": [36, 162, 73, 255], "all_axis": [255, 255, 255, 255], - "viewport_background": [ - 230, - 238, - 244, - 255 - ], - "volume_outline": [ - 111, - 143, - 193, - 255 - ], - "buildplate": [ - 230, - 238, - 255, - 255 - ], + + "viewport_background": [250, 250, 250, 255], + "volume_outline": [50, 130, 255, 255], + "buildplate": [244, 244, 244, 255], "buildplate_grid": [180, 180, 180, 255], "buildplate_grid_minor": [228, 228, 228, 255], @@ -630,79 +440,24 @@ "model_overhang": [255, 0, 0, 255], "model_unslicable": [122, 122, 122, 255], "model_unslicable_alt": [172, 172, 127, 255], - "model_selection_outline": [ - 111, - 143, - 193, - 255 - ], + "model_selection_outline": [50, 130, 255, 255], "model_non_printing": [122, 122, 122, 255], "xray": [26, 26, 62, 255], "layerview_ghost": [31, 31, 31, 95], "layerview_none": [255, 255, 255, 255], - "layerview_inset_0": [ - 161, - 69, - 69, - 255 - ], - "layerview_inset_x": [ - 69, - 161, - 69, - 255 - ], - "layerview_skin": [ - 161, - 161, - 69, - 255 - ], - "layerview_support": [ - 69, - 161, - 161, - 127 - ], - "layerview_skirt": [ - 69, - 161, - 161, - 255 - ], - "layerview_infill": [ - 161, - 115, - 69, - 255 - ], - "layerview_support_infill": [ - 69, - 161, - 161, - 127 - ], - "layerview_move_combing": [ - 69, - 69, - 161, - 255 - ], + "layerview_inset_0": [230, 0, 0, 255], + "layerview_inset_x": [0, 230, 0, 255], + "layerview_skin": [230, 230, 0, 255], + "layerview_support": [0, 230, 230, 127], + "layerview_skirt": [0, 230, 230, 255], + "layerview_infill": [230, 115, 0, 255], + "layerview_support_infill": [0, 230, 230, 127], + "layerview_move_combing": [0, 0, 255, 255], "layerview_move_retraction": [128, 127, 255, 255], - "layerview_support_interface": [ - 121, - 146, - 197, - 127 - ], - "layerview_prime_tower": [ - 77, - 178, - 179, - 255 - ], + "layerview_support_interface": [63, 127, 255, 127], + "layerview_prime_tower": [0, 255, 255, 255], "layerview_nozzle": [224, 192, 16, 64], "layerview_starts": [255, 255, 255, 255],