Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-02-05 11:40:50 +01:00
commit 4ea6e5d0df
9 changed files with 62 additions and 211 deletions

View file

@ -49,6 +49,7 @@ Rectangle
wrapMode: Text.WordWrap
elide: Text.ElideRight
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
}
UM.RecolorImage
{