3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Browse source 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
This commit is contained in:
Ghostkeeper 2018-12-03 11:45:05 +01:00
commit 7df4c01814
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
78 changed files with 1372 additions and 743 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ActionPanel/PrintJobInformation.qml
View file

@ -21,7 +21,6 @@ Column
Column
{
id: timeSpecification
spacing: UM.Theme.getSize("thin_margin").width
width: parent.width
topPadding: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("default_margin").width
@ -71,7 +70,6 @@ Column
Column
{
id: materialSpecification
spacing: UM.Theme.getSize("thin_margin").width
width: parent.width
bottomPadding: UM.Theme.getSize("default_margin").height
leftPadding: UM.Theme.getSize("default_margin").width