mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 13:34:01 -06:00
Merge branch 'master' into CURA-6862_truncate_profile_names
This commit is contained in:
commit
fde4804a58
26 changed files with 106 additions and 55 deletions
|
@ -75,7 +75,6 @@ Item
|
|||
|
||||
baselineOffset: null // If we don't do this, there is a binding loop. WHich is a bit weird, since we override the contentItem anyway...
|
||||
|
||||
|
||||
contentItem: RowLayout
|
||||
{
|
||||
spacing: 0
|
||||
|
@ -83,8 +82,6 @@ Item
|
|||
anchors.right: customisedSettings.left
|
||||
anchors.leftMargin: UM.Theme.getSize("default_margin").width
|
||||
|
||||
|
||||
|
||||
Label
|
||||
{
|
||||
id: textLabel
|
||||
|
@ -181,7 +178,6 @@ Item
|
|||
{
|
||||
id: downArrow
|
||||
|
||||
|
||||
source: UM.Theme.getIcon("arrow_bottom")
|
||||
width: UM.Theme.getSize("standard_arrow").width
|
||||
height: UM.Theme.getSize("standard_arrow").height
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue