From 2074bf913311c85a165e85b0b5c899ab4a6db617 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Fri, 22 Mar 2019 13:06:35 +0100
Subject: [PATCH] Use theme

---
 resources/qml/WelcomePages/DropDownWidget.qml  | 4 +++-
 resources/qml/WelcomePages/StepPanel.qml       | 3 ++-
 resources/qml/WelcomePages/WhatsNewContent.qml | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/qml/WelcomePages/DropDownWidget.qml b/resources/qml/WelcomePages/DropDownWidget.qml
index 43f92218fc..9f413769e0 100644
--- a/resources/qml/WelcomePages/DropDownWidget.qml
+++ b/resources/qml/WelcomePages/DropDownWidget.qml
@@ -74,7 +74,9 @@ Item
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.margins: 1
+            // Keep a small margin with the Rectangle container so its content will not overlap with the Rectangle
+            // border.
+            anchors.margins: UM.Theme.getSize("default_lining").width
             sourceComponent: base.contentComponent != null ? base.contentComponent : emptyComponent
         }
 
diff --git a/resources/qml/WelcomePages/StepPanel.qml b/resources/qml/WelcomePages/StepPanel.qml
index 7e0c00a987..1ec44571b5 100644
--- a/resources/qml/WelcomePages/StepPanel.qml
+++ b/resources/qml/WelcomePages/StepPanel.qml
@@ -41,7 +41,8 @@ Item
         {
             currentStep++
         }
-        else {
+        else
+        {
             passLastPage()
         }
     }
diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml
index 2c51fdd1cd..d9d3648d6a 100644
--- a/resources/qml/WelcomePages/WhatsNewContent.qml
+++ b/resources/qml/WelcomePages/WhatsNewContent.qml
@@ -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