3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 13:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Revert "fix merge conflict""

Browse source 
This reverts commit 4bffa6d90f.
This commit is contained in:
Daniel Schiavini 2018-12-07 10:25:46 +01:00
parent 4bffa6d90f
commit a1c252d3a2
73 changed files with 3047 additions and 1216 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/PrepareStage/PrepareMenu.qml
View file

@ -61,7 +61,7 @@ Item
color: UM.Theme.getColor("lining")
}
Cura.QuickConfigurationSelector
Cura.ConfigurationMenu
{
Layout.fillHeight: true
Layout.fillWidth: true
@ -107,7 +107,6 @@ Item
height: UM.Theme.getSize("button_icon").height
color: UM.Theme.getColor("toolbar_button_text")
sourceSize.width: width
sourceSize.height: height
}
}