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 11

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 14:28:23 +01:00
commit ec0b197b6e
9 changed files with 159 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/WelcomePages/WhatsNewContent.qml
View file

@ -32,8 +32,8 @@ Item
{
anchors.top: titleLabel.bottom
anchors.bottom: getStartedButton.top
anchors.topMargin: 40
anchors.bottomMargin: 40
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
anchors.bottomMargin: UM.Theme.getSize("welcome_pages_default_margin").height
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width * 3 / 4