Merge remote-tracking branch 'origin/profile_changes_reset' into updating

This commit is contained in:
YuSanka 2018-04-26 12:47:32 +02:00
commit 4d07b63b5a
5 changed files with 53 additions and 13 deletions

View file

@ -201,8 +201,8 @@ static void init_label_colours()
{
auto luma = get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
if (luma >= 128) {
g_color_label_modified = wxColour(253, 88, 0);
g_color_label_sys = wxColour(26, 132, 57);
g_color_label_modified = wxColour(255, 108, 30);//wxColour(253, 88, 0);
g_color_label_sys = wxColour(19, 100, 44); //wxColour(26, 132, 57);
} else {
g_color_label_modified = wxColour(253, 111, 40);
g_color_label_sys = wxColour(115, 220, 103);