From 1589475dd47bf802ae401d7dd344c502ec96a1b5 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Feb 2022 13:54:50 +0100 Subject: [PATCH] Remove a slew of unusued colors in the theme --- .../themes/cura-dark-colorblind/theme.json | 4 -- resources/themes/cura-dark/theme.json | 30 -------- .../themes/cura-light-colorblind/theme.json | 1 - resources/themes/cura-light/theme.json | 71 ------------------- 4 files changed, 106 deletions(-) diff --git a/resources/themes/cura-dark-colorblind/theme.json b/resources/themes/cura-dark-colorblind/theme.json index c98fb0c815..4a006ee836 100644 --- a/resources/themes/cura-dark-colorblind/theme.json +++ b/resources/themes/cura-dark-colorblind/theme.json @@ -8,12 +8,8 @@ "x_axis": [212, 0, 0, 255], "y_axis": [64, 64, 255, 255], - "model_default": [156, 201, 36, 255], "model_overhang": [200, 0, 255, 255], - - "xray_error_dark": [255, 0, 0, 255], - "xray_error_light": [255, 255, 0, 255], "xray": [26, 26, 62, 255], "xray_error": [255, 0, 0, 255], diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 56638cc3ef..936accdccd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -34,8 +34,6 @@ "account_sync_state_icon": [255, 255, 255, 204], - "machine_selector_bar": [39, 44, 48, 255], - "machine_selector_active": [39, 44, 48, 255], "machine_selector_printer_icon": [204, 204, 204, 255], "text": [255, 255, 255, 204], @@ -43,8 +41,6 @@ "text_link": [25, 110, 240, 255], "text_inactive": [255, 255, 255, 88], "text_hover": [255, 255, 255, 204], - "text_pressed": [255, 255, 255, 204], - "text_subtext": [255, 255, 255, 172], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], @@ -55,22 +51,14 @@ "button": [39, 44, 48, 255], "button_hover": [39, 44, 48, 255], - "button_active": [67, 72, 75, 255], - "button_active_hover": [67, 72, 75, 255], "button_text": [255, 255, 255, 197], "button_disabled": [39, 44, 48, 255], "button_disabled_text": [255, 255, 255, 101], - "small_button": [39, 44, 48, 0], - "small_button_hover": [39, 44, 48, 255], - "small_button_active": [67, 72, 75, 255], - "small_button_active_hover": [67, 72, 75, 255], "small_button_text": [255, 255, 255, 197], "small_button_text_hover": [255, 255, 255, 255], "button_tooltip": [39, 44, 48, 255], - "button_tooltip_border": [39, 44, 48, 255], - "button_tooltip_text": [255, 255, 255, 172], "tab_checked": [39, 44, 48, 255], "tab_checked_border": [255, 255, 255, 30], @@ -87,17 +75,9 @@ "tab_background": [39, 44, 48, 255], "action_button": [39, 44, 48, 255], - "action_button_text": [255, 255, 255, 200], - "action_button_border": [255, 255, 255, 30], "action_button_hovered": [79, 85, 89, 255], - "action_button_hovered_text": [255, 255, 255, 255], - "action_button_hovered_border": [255, 255, 255, 30], - "action_button_active": [39, 44, 48, 30], - "action_button_active_text": [255, 255, 255, 255], - "action_button_active_border": [255, 255, 255, 100], "action_button_disabled": [85, 85, 87, 255], "action_button_disabled_text": [103, 103, 104, 255], - "action_button_disabled_border": [255, 255, 255, 30], "scrollbar_background": [39, 44, 48, 0], "scrollbar_handle": [255, 255, 255, 105], @@ -107,21 +87,11 @@ "setting_category": [75, 80, 83, 255], "setting_category_disabled": [75, 80, 83, 255], "setting_category_hover": [75, 80, 83, 255], - "setting_category_active": [75, 80, 83, 255], - "setting_category_active_hover": [75, 80, 83, 255], "setting_category_text": [255, 255, 255, 152], "setting_category_disabled_text": [255, 255, 255, 101], - "setting_category_hover_text": [255, 255, 255, 204], "setting_category_active_text": [255, 255, 255, 204], - "setting_category_active_hover_text": [255, 255, 255, 204], - "setting_category_border": [39, 44, 48, 0], - "setting_category_disabled_border": [39, 44, 48, 0], - "setting_category_hover_border": [12, 169, 227, 255], - "setting_category_active_border": [39, 44, 48, 0], - "setting_category_active_hover_border": [12, 169, 227, 255], "setting_control": [43, 48, 52, 255], - "setting_control_selected": [34, 39, 42, 38], "setting_control_highlight": [43, 48, 52, 255], "setting_control_border": [255, 255, 255, 38], "setting_control_border_highlight": [12, 169, 227, 255], diff --git a/resources/themes/cura-light-colorblind/theme.json b/resources/themes/cura-light-colorblind/theme.json index 5628fad880..740bf977b2 100644 --- a/resources/themes/cura-light-colorblind/theme.json +++ b/resources/themes/cura-light-colorblind/theme.json @@ -8,7 +8,6 @@ "x_axis": [200, 0, 0, 255], "y_axis": [64, 64, 255, 255], - "model_default": [156, 201, 36, 255], "model_overhang": [200, 0, 255, 255], "model_selection_outline": [12, 169, 227, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index e35b7c923f..2d846f20b8 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -171,7 +171,6 @@ }, "colors": { - "main_background": [255, 255, 255, 255], "detail_background": [243, 243, 243, 255], "wide_lining": [245, 245, 245, 255], @@ -180,20 +179,14 @@ "viewport_overlay": [246, 246, 246, 255], "primary": [25, 110, 240, 255], - "primary_shadow": [64, 47, 205, 255], "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], - "border": [127, 127, 127, 255], "text_selection": [156, 195, 255, 127], "secondary": [240, 240, 240, 255], - "secondary_shadow": [216, 216, 216, 255], - - "text_lighter": [108, 108, 108, 255], "icon": [8, 7, 63, 255], "primary_button": [25, 110, 240, 255], - "primary_button_shadow": [27, 95, 202, 255], "primary_button_hover": [16, 70, 156, 255], "primary_button_text": [255, 255, 255, 255], @@ -214,10 +207,6 @@ "account_widget_outline_active": [70, 66, 126, 255], "account_sync_state_icon": [25, 25, 25, 255], - "machine_selector_bar": [31, 36, 39, 255], - "machine_selector_active": [68, 72, 75, 255], - "machine_selector_hover": [68, 72, 75, 255], - "machine_selector_text_active": [255, 255, 255, 255], "machine_selector_printer_icon": [8, 7, 63, 255], "action_panel_secondary": [25, 110, 240, 255], @@ -236,10 +225,7 @@ "text_detail": [174, 174, 174, 128], "text_link": [25, 110, 240, 255], "text_inactive": [174, 174, 174, 255], - "text_pressed": [50, 130, 255, 255], - "text_subtext": [0, 0, 0, 255], "text_medium": [128, 128, 128, 255], - "text_emphasis": [255, 255, 255, 255], "text_scene": [102, 102, 102, 255], "text_scene_hover": [123, 123, 113, 255], @@ -252,48 +238,20 @@ "toolbar_button_active": [232, 242, 252, 255], "toolbar_button_active_hover": [232, 242, 252, 255], - "button": [31, 36, 39, 255], - "button_hover": [68, 72, 75, 255], - "button_active": [68, 72, 75, 255], - "button_active_hover": [68, 72, 75, 255], "button_text": [255, 255, 255, 255], - "button_text_hover": [255, 255, 255, 255], - "button_text_active": [255, 255, 255, 255], - "button_text_active_hover": [255, 255, 255, 255], - "small_button": [0, 0, 0, 0], - "small_button_hover": [102, 102, 102, 255], - "small_button_active": [10, 8, 80, 255], - "small_button_active_hover": [10, 8, 80, 255], "small_button_text": [102, 102, 102, 255], "small_button_text_hover": [8, 7, 63, 255], - "small_button_text_active": [255, 255, 255, 255], - "small_button_text_active_hover": [255, 255, 255, 255], "button_tooltip": [31, 36, 39, 255], - "button_tooltip_border": [68, 192, 255, 255], - "button_tooltip_text": [192, 193, 194, 255], - "extruder_button_material_border": [255, 255, 255, 255], "extruder_disabled": [255, 255, 255, 102], - "sync_button_text": [120, 120, 120, 255], - "sync_button_text_hovered": [0, 0, 0, 255], - "action_button": [255, 255, 255, 255], - "action_button_text": [0, 0, 0, 255], - "action_button_border": [127, 127, 127, 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], - "action_button_active_text": [0, 0, 0, 255], - "action_button_active_border": [50, 130, 255, 255], "action_button_disabled": [245, 245, 245, 255], "action_button_disabled_text": [196, 196, 196, 255], - "action_button_disabled_border": [196, 196, 196, 255], "action_button_shadow": [223, 223, 223, 255], - "action_button_disabled_shadow": [228, 228, 228, 255], "scrollbar_background": [255, 255, 255, 255], "scrollbar_handle": [10, 8, 80, 255], @@ -303,21 +261,11 @@ "setting_category": [240, 240, 240, 255], "setting_category_disabled": [255, 255, 255, 255], "setting_category_hover": [232, 242, 252, 255], - "setting_category_active": [240, 240, 240, 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_active_text": [35, 35, 35, 255], - "setting_category_active_hover_text": [35, 35, 35, 255], - "setting_category_hover_text": [35, 35, 35, 255], - "setting_category_border": [240, 240, 240, 255], - "setting_category_disabled_border": [240, 240, 240, 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": [199, 199, 199, 255], "setting_control_border_highlight": [50, 130, 255, 255], @@ -333,7 +281,6 @@ "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": [243, 166, 59, 255], @@ -377,7 +324,6 @@ "status_busy": [50, 130, 255, 255], "status_paused": [255, 140, 0, 255], "status_stopped": [236, 82, 80, 255], - "status_unknown": [127, 127, 127, 255], "disabled_axis": [127, 127, 127, 255], "x_axis": [218, 30, 40, 255], @@ -395,17 +341,13 @@ "disallowed_area": [0, 0, 0, 40], "error_area": [255, 0, 0, 127], - "model_default": [255, 201, 36, 255], "model_overhang": [255, 0, 0, 255], "model_unslicable": [122, 122, 122, 255], "model_unslicable_alt": [172, 172, 127, 255], "model_selection_outline": [50, 130, 255, 255], "model_non_printing": [122, 122, 122, 255], - "xray_error_dark": [255, 0, 0, 255], - "xray_error_light": [255, 255, 0, 255], "xray": [26, 26, 62, 255], - "xray_error": [255, 0, 0, 255], "layerview_ghost": [31, 31, 31, 95], "layerview_none": [255, 255, 255, 255], @@ -423,16 +365,7 @@ "layerview_nozzle": [224, 192, 16, 64], "layerview_starts": [255, 255, 255, 255], - "tab_status_connected": [50, 130, 255, 255], - "tab_status_disconnected": [200, 200, 200, 255], - - "printer_config_matched": [50, 130, 255, 255], - "printer_config_mismatch": [127, 127, 127, 255], - "favorites_header_bar": [245, 245, 245, 255], - "favorites_header_hover": [245, 245, 245, 255], - "favorites_header_text": [31, 36, 39, 255], - "favorites_header_text_hover": [31, 36, 39, 255], "favorites_row_selected": [196, 239, 255, 255], "monitor_printer_family_tag": [228, 228, 242, 255], @@ -453,10 +386,6 @@ "monitor_stage_background": [246, 246, 246, 255], "monitor_stage_background_fade": [246, 246, 246, 102], - "monitor_progress_bar_fill": [50, 130, 255, 255], - "monitor_progress_bar_deactive": [192, 193, 194, 255], - "monitor_progress_bar_empty": [245, 245, 245, 255], - "monitor_tooltip": [25, 25, 25, 255], "monitor_tooltip_text": [255, 255, 255, 255], "monitor_context_menu": [255, 255, 255, 255],