mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 03:46:05 +08:00
Merge remote-tracking branch 'origin/4.0' into CL-1151_add_monitor_carousel
This commit is contained in:
commit
2112681217
@ -19,7 +19,6 @@ Item
|
|||||||
property alias color: label.color
|
property alias color: label.color
|
||||||
property alias text: label.text
|
property alias text: label.text
|
||||||
property alias font: label.font
|
property alias font: label.font
|
||||||
property alias iconColor: icon.color
|
|
||||||
property real margin: UM.Theme.getSize("narrow_margin").width
|
property real margin: UM.Theme.getSize("narrow_margin").width
|
||||||
|
|
||||||
// These properties can be used in combination with layouts.
|
// These properties can be used in combination with layouts.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user