From 17986aa4adbfce1f356ffb54fa80dc038da17afe Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Thu, 14 Sep 2017 13:04:29 +0200 Subject: [PATCH] CURA-4318 add border to toolbar buttons in dark theme, outline fix for unknown printer status icon in dark theme --- resources/themes/cura-dark/icons/tab_status_unknown.svg | 2 +- resources/themes/cura-dark/theme.json | 2 ++ resources/themes/cura-light/icons/tab_status_unknown.svg | 2 +- resources/themes/cura-light/theme.json | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/themes/cura-dark/icons/tab_status_unknown.svg b/resources/themes/cura-dark/icons/tab_status_unknown.svg index 249ae55554..94dc47c018 100644 --- a/resources/themes/cura-dark/icons/tab_status_unknown.svg +++ b/resources/themes/cura-dark/icons/tab_status_unknown.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 906a5c280e..5c77f5144d 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -141,6 +141,8 @@ "tool_panel_background": [39, 44, 48, 255], + "tool_button_border": [255, 255, 255, 38], + "status_offline": [0, 0, 0, 255], "status_ready": [0, 205, 0, 255], "status_busy": [12, 169, 227, 255], diff --git a/resources/themes/cura-light/icons/tab_status_unknown.svg b/resources/themes/cura-light/icons/tab_status_unknown.svg index f195ae238a..a6aea3be84 100644 --- a/resources/themes/cura-light/icons/tab_status_unknown.svg +++ b/resources/themes/cura-light/icons/tab_status_unknown.svg @@ -5,7 +5,7 @@ Created with Sketch. - + diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 1271dfbe71..fb6e43d0be 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -221,7 +221,7 @@ "tooltip": [68, 192, 255, 255], "tooltip_text": [255, 255, 255, 255], - "tool_button_border": [39, 44, 48, 255], + "tool_button_border": [255, 255, 255, 0], "message_background": [255, 255, 255, 255], "message_shadow": [0, 0, 0, 120], @@ -338,6 +338,8 @@ "button_tooltip": [1.0, 1.3], "button_tooltip_arrow": [0.25, 0.25], + "tool_button_border": [1.0, 0], + "progressbar": [26.0, 0.4], "progressbar_radius": [0, 0], "progressbar_control": [8.0, 0.4],