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

@ -107,7 +107,7 @@ Cura.ExpandablePopup
id: buttonText
text: viewsSelectorButton.text
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("action_button")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight