3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into fix_is_clustersize

Browse source 
# Conflicts:
#	plugins/UM3NetworkPrinting/UM3InfoComponents.qml
#	resources/qml/Menus/MaterialMenu.qml
#	resources/qml/Menus/NozzleMenu.qml
This commit is contained in:
fieldOfView 2017-10-26 11:09:13 +02:00
commit fff9330949
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/SaveButton.qml
View file

@ -91,8 +91,8 @@ Item {
id: saveRow
width: base.width
height: saveToButton.height
anchors.top: progressBar.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.bottom: parent.bottom
anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height
anchors.left: parent.left
Row {