3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-26 09:01:01 +01:00
commit a85f2ce156
52 changed files with 202 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,15 +35,15 @@ Item
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
width: (parent.width * 3 / 4) | 0
border.color: "#dfdfdf"
border.width: 1
border.width: UM.Theme.getSize("default_lining").width
ScrollView
{
anchors.fill: parent
anchors.margins: 1
anchors.margins: UM.Theme.getSize("default_lining").width
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff