From f30146498748c72177a29058d783a77a25fbbd44 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 29 Aug 2017 15:02:27 +0200 Subject: [PATCH] Update missing colours And colours that have to change because the behaviour was changed (such as opacities now being themeable. Contributes to issue CURA-4148. --- resources/themes/cura-light/theme.json | 39 +++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index c72eeb95d0..bf48e256e2 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -51,7 +51,7 @@ "colors": { "sidebar": [255, 255, 255, 255], "lining": [127, 127, 127, 255], - "viewport_overlay": [24, 41, 77, 255], + "viewport_overlay": [24, 41, 77, 192], "primary": [12, 169, 227, 255], "primary_hover": [48, 182, 231, 255], @@ -65,8 +65,10 @@ "text_inactive": [174, 174, 174, 255], "text_hover": [70, 84, 113, 255], "text_pressed": [12, 169, 227, 255], - "text_reversed": [255, 255, 255, 255], "text_subtext": [70, 84, 113, 255], + "text_emphasis": [255, 255, 255, 255], + "text_scene": [24, 41, 77, 255], + "text_scene_hover": [70, 84, 113, 255], "error": [255, 140, 0, 255], "sidebar_header_bar": [24, 41, 77, 255], @@ -74,6 +76,9 @@ "sidebar_header_hover": [24, 41, 77, 255], "sidebar_header_highlight": [12, 169, 227, 255], "sidebar_header_highlight_hover": [255, 255, 255, 255], + "sidebar_header_text_inactive": [255, 255, 255, 255], + "sidebar_header_text_active": [255, 255, 255, 255], + "sidebar_header_text_hover": [255, 255, 255, 255], "sidebar_lining": [245, 245, 245, 255], "button": [24, 41, 77, 255], @@ -81,26 +86,16 @@ "button_active": [32, 166, 219, 255], "button_active_hover": [12, 169, 227, 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], "button_disabled": [24, 41, 77, 255], - "button_disabled_text": [70, 84, 113, 255], + "button_disabled_text": [70, 84, 113, 51], - "button_tooltip": [255, 255, 255, 255], + "button_tooltip": [12, 169, 227, 255], "button_tooltip_border": [24, 41, 77, 255], "button_tooltip_text": [24, 41, 77, 255], - "toggle_checked": [24, 41, 77, 255], - "toggle_checked_border": [24, 41, 77, 255], - "toggle_checked_text": [255, 255, 255, 255], - "toggle_unchecked": [255, 255, 255, 255], - "toggle_unchecked_border": [127, 127, 127, 255], - "toggle_unchecked_text": [24, 41, 77, 255], - "toggle_hovered": [255, 255, 255, 255], - "toggle_hovered_border": [32, 166, 219, 255], - "toggle_hovered_text": [24, 41, 77, 255], - "toggle_active": [32, 166, 219, 255], - "toggle_active_border": [32, 166, 219, 255], - "toggle_active_text": [24, 41, 77, 255], - "tab_checked": [255, 255, 255, 255], "tab_checked_border": [255, 255, 255, 255], "tab_checked_text": [24, 41, 77, 255], @@ -139,6 +134,10 @@ "setting_category_active": [245, 245, 245, 255], "setting_category_active_hover": [245, 245, 245, 255], "setting_category_text": [24, 41, 77, 255], + "setting_category_disabled_text": [24, 41, 77, 101], + "setting_category_hover_text": [24, 41, 77, 255], + "setting_category_active_text": [24, 41, 77, 255], + "setting_category_active_hover_text": [24, 41, 77, 255], "setting_category_border": [245, 245, 245, 255], "setting_category_disabled_border": [245, 245, 245, 255], "setting_category_hover_border": [12, 159, 227, 255], @@ -158,8 +157,10 @@ "setting_control_disabled_text": [127, 127, 127, 255], "setting_control_disabled_border": [127, 127, 127, 255], "setting_unit": [127, 127, 127, 255], - "setting_validation_error": [255, 57, 14, 255], - "setting_validation_warning": [255, 186, 15, 255], + "setting_validation_error_background": [255, 57, 14, 255], + "setting_validation_error": [127, 127, 127, 255], + "setting_validation_warning_background": [255, 186, 15, 255], + "setting_validation_warning": [127, 127, 127, 255], "setting_validation_ok": [255, 255, 255, 255], "progressbar_background": [245, 245, 245, 255],