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

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 12:07:59 +01:00
commit 9e7c687853
9 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/WelcomePages/CloudContent.qml
View file

@ -19,7 +19,7 @@ Item
{
id: titleLabel
anchors.top: parent.top
anchors.topMargin: 40
anchors.topMargin: UM.Theme.getSize("welcome_pages_default_margin").height
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "Ultimaker Cloud")
@ -101,7 +101,7 @@ Item
id: finishButton
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: 40
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
text: catalog.i18nc("@button", "Finish")
width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true
@ -113,7 +113,7 @@ Item
id: createAccountButton
anchors.left: parent.left
anchors.verticalCenter: finishButton.verticalCenter
anchors.margins: 40
anchors.margins: UM.Theme.getSize("welcome_pages_default_margin").width
text: catalog.i18nc("@button", "Create an account")
width: UM.Theme.getSize("welcome_pages_button").width
fixedWidthMode: true