Merge remote-tracking branch 'origin/4.1'

This commit is contained in:
Lipu Fei 2019-05-17 14:41:52 +02:00
commit 33aae24d6d
6 changed files with 5 additions and 5 deletions

View file

@ -22,7 +22,7 @@ Item
property int labelWidth: 210 * screenScaleFactor
property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0
property var labelFont: UM.Theme.getFont("medium")
property var labelFont: UM.Theme.getFont("default")
property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0
property int columnSpacing: 3 * screenScaleFactor