Merge branch 'CURA-5876_fixes' into 4.0

This commit is contained in:
Ghostkeeper 2018-12-14 16:28:04 +01:00
commit 78a5f95c43
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
23 changed files with 218 additions and 431 deletions

View file

@ -110,7 +110,7 @@ SettingItem
sourceSize.width: width + 5 * screenScaleFactor
sourceSize.height: width + 5 * screenScaleFactor
color: UM.Theme.getColor("setting_control_text");
color: UM.Theme.getColor("setting_control_button");
}
background: Rectangle