From 26bd93f6914cf6c0ff2e4a085d609f29f0262fec Mon Sep 17 00:00:00 2001 From: EquinusOcio Date: Tue, 25 Oct 2016 19:13:05 +0200 Subject: [PATCH] fix: Improve buttons and sidebar colors --- Material-Theme-Darker.sublime-theme | 20 ++++++++++------ Material-Theme-Palenight.sublime-theme | 12 ++++++---- Material-Theme.sublime-theme | 22 +++++++++++------- assets/palenight/tree_highlight--tint.png | Bin 0 -> 96 bytes .../specific/Material-Theme-Darker.json | 4 ++-- sources/settings/specific/Material-Theme.json | 4 ++-- sources/themes/darker/buttons.json | 20 ++++++++++------ sources/themes/darker/sidebar.json | 2 +- sources/themes/default/buttons.json | 20 ++++++++++------ sources/themes/default/sidebar.json | 4 ++-- sources/themes/palenight/buttons.json | 8 ++++++- sources/themes/palenight/statusbar.json | 4 +--- 12 files changed, 76 insertions(+), 44 deletions(-) create mode 100644 assets/palenight/tree_highlight--tint.png diff --git a/Material-Theme-Darker.sublime-theme b/Material-Theme-Darker.sublime-theme index 63a429096..df45746b3 100755 --- a/Material-Theme-Darker.sublime-theme +++ b/Material-Theme-Darker.sublime-theme @@ -1251,14 +1251,20 @@ // Button labels - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [176, 190, 196], - "font.bold": true - }, + { + "class": "label_control", + "parents": [{"class": "button_control"}], + "color": [97, 97, 97], + "font.bold": true + }, - { + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + + { "class": "button_control", "content_margin": [6, 12, 6, 12], "min_size": [75, 0], diff --git a/Material-Theme-Palenight.sublime-theme b/Material-Theme-Palenight.sublime-theme index 7d0564364..4c6744881 100755 --- a/Material-Theme-Palenight.sublime-theme +++ b/Material-Theme-Palenight.sublime-theme @@ -1115,9 +1115,7 @@ "font.bold": true }, - // Status bar labels - - { + { "class": "label_control", "parents": [{"class": "status_bar"}], "color": [103, 110, 149], @@ -1269,10 +1267,16 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": [176, 190, 196], + "color": [103, 110, 149], "font.bold": true }, + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + { "class": "button_control", "content_margin": [6, 12, 6, 12], diff --git a/Material-Theme.sublime-theme b/Material-Theme.sublime-theme index cf94e930c..df6b2b86c 100755 --- a/Material-Theme.sublime-theme +++ b/Material-Theme.sublime-theme @@ -602,7 +602,7 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["hover"]}], - "color": [175, 189, 196], + "color": [255,255,255], "shadow_color": [255, 255, 255, 0], "shadow_offset": [0, 0] }, @@ -1266,14 +1266,20 @@ // Button labels - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [176, 190, 196], - "font.bold": true - }, + { + "class": "label_control", + "parents": [{"class": "button_control"}], + "color": [96, 125, 139], + "font.bold": true + }, - { + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + + { "class": "button_control", "content_margin": [6, 12, 6, 12], "min_size": [75, 0], diff --git a/assets/palenight/tree_highlight--tint.png b/assets/palenight/tree_highlight--tint.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1c523bbcfc29778447068b1b048a26271905e8 GIT binary patch literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2xGmzZ=C-xtZVk{1FcVbv~PUa<$!yMof;`;yp r|K&%dPXM{xo-U3d9M_W*4zM#Y$T2YHwYnPtg&90u{an^LB{Ts5Ckq&A literal 0 HcmV?d00001 diff --git a/sources/settings/specific/Material-Theme-Darker.json b/sources/settings/specific/Material-Theme-Darker.json index d3aee79cb..07ed75297 100644 --- a/sources/settings/specific/Material-Theme-Darker.json +++ b/sources/settings/specific/Material-Theme-Darker.json @@ -20,8 +20,8 @@ }, "foreground": { "primary": { - "hex": "#a7adb0", - "rgb": "167, 173, 176" + "hex": "#616161", + "rgb": "97, 97, 97" }, "secondary": { "hex": "#6f7a7f", diff --git a/sources/settings/specific/Material-Theme.json b/sources/settings/specific/Material-Theme.json index deb86d49b..cc6330213 100644 --- a/sources/settings/specific/Material-Theme.json +++ b/sources/settings/specific/Material-Theme.json @@ -20,8 +20,8 @@ }, "foreground": { "primary": { - "hex": "#a7adb0", - "rgb": "167, 173, 176" + "hex": "#394E59", + "rgb": "96, 125, 139" }, "selected": { "hex": "#dddfe1", diff --git a/sources/themes/darker/buttons.json b/sources/themes/darker/buttons.json index 40b1ef7a0..fcf470c8c 100755 --- a/sources/themes/darker/buttons.json +++ b/sources/themes/darker/buttons.json @@ -6,14 +6,20 @@ // Button labels - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [176, 190, 196], - "font.bold": true - }, + { + "class": "label_control", + "parents": [{"class": "button_control"}], + "color": [<%= ui.foreground.primary.rgb %>], + "font.bold": true + }, - { + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + + { "class": "button_control", "content_margin": [6, 12, 6, 12], "min_size": [75, 0], diff --git a/sources/themes/darker/sidebar.json b/sources/themes/darker/sidebar.json index d23af5c66..26b50068d 100755 --- a/sources/themes/darker/sidebar.json +++ b/sources/themes/darker/sidebar.json @@ -68,7 +68,7 @@ { "class": "sidebar_label", - "color": [97, 97, 97], + "color": [<%= ui.foreground.primary.rgb %>], "font.bold": false, "font.italic": false, "shadow_color": [255, 255, 255, 0], diff --git a/sources/themes/default/buttons.json b/sources/themes/default/buttons.json index 3ae6f7ff7..fed331f85 100755 --- a/sources/themes/default/buttons.json +++ b/sources/themes/default/buttons.json @@ -6,14 +6,20 @@ // Button labels - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [176, 190, 196], - "font.bold": true - }, + { + "class": "label_control", + "parents": [{"class": "button_control"}], + "color": [<%= ui.foreground.primary.rgb %>], + "font.bold": true + }, - { + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + + { "class": "button_control", "content_margin": [6, 12, 6, 12], "min_size": [75, 0], diff --git a/sources/themes/default/sidebar.json b/sources/themes/default/sidebar.json index 03e93622d..f67b12ea6 100755 --- a/sources/themes/default/sidebar.json +++ b/sources/themes/default/sidebar.json @@ -69,7 +69,7 @@ { "class": "sidebar_label", - "color": [96, 125, 139], + "color": [<%= ui.foreground.primary.rgb %>], "font.bold": false, "font.italic": false, "shadow_color": [255, 255, 255, 0], @@ -79,7 +79,7 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["hover"]}], - "color": [175, 189, 196], + "color": [255,255,255], "shadow_color": [255, 255, 255, 0], "shadow_offset": [0, 0] }, diff --git a/sources/themes/palenight/buttons.json b/sources/themes/palenight/buttons.json index c6a82cf6c..a860d0c57 100755 --- a/sources/themes/palenight/buttons.json +++ b/sources/themes/palenight/buttons.json @@ -9,10 +9,16 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": [176, 190, 196], + "color": [<%= ui.foreground.primary.rgb %>], "font.bold": true }, + { + "class": "label_control", + "parents": [{"class": "button_control", "attributes": ["hover"]}], + "color": [255,255,255] + }, + { "class": "button_control", "content_margin": [6, 12, 6, 12], diff --git a/sources/themes/palenight/statusbar.json b/sources/themes/palenight/statusbar.json index 0b9fd5ab3..f1050b189 100755 --- a/sources/themes/palenight/statusbar.json +++ b/sources/themes/palenight/statusbar.json @@ -13,9 +13,7 @@ "font.bold": true }, - // Status bar labels - - { + { "class": "label_control", "parents": [{"class": "status_bar"}], "color": [<%= ui.foreground.primary.rgb %>],