Merge branch '4.0'

This commit is contained in:
Ghostkeeper 2019-01-03 11:09:28 +01:00
commit 78ee666919
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
47 changed files with 89 additions and 85 deletions

View file

@ -43,7 +43,7 @@ Cura.ExpandableComponent
verticalAlignment: Text.AlignVCenter
height: parent.height
elide: Text.ElideRight
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text_medium")
renderType: Text.NativeRendering
}
@ -60,7 +60,7 @@ Cura.ExpandableComponent
}
height: parent.height
elide: Text.ElideRight
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}