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

Merge remote-tracking branch 'origin/master' into feature_intent

Browse source
This commit is contained in:
Lipu Fei 2019-10-01 09:41:05 +02:00
commit 96a9bcccbb
55 changed files with 551 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/ActionPanel/ActionPanelWidget.qml
View file

@ -27,7 +27,7 @@ Item
width: UM.Theme.getSize("action_panel_widget").width
height: childrenRect.height + 2 * UM.Theme.getSize("thick_margin").height
anchors. right: parent.right
anchors.right: parent.right
color: UM.Theme.getColor("main_background")
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")
@ -103,4 +103,4 @@ Item
CuraApplication.additionalComponents["saveButton"][component].parent = additionalComponentsRow
}
}
}
}