[PATCH 2/2] QML UI: align controls on settings page

[Rick Walsh]

Signed-off-by: Rick Walsh <rickmwalsh at gmail.com>
---
 mobile-widgets/qml/CloudCredentials.qml | 8 ++++----
 mobile-widgets/qml/Settings.qml         | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml
index c1f38434..4ae5ebd5 100644
--- a/mobile-widgets/qml/CloudCredentials.qml
+++ b/mobile-widgets/qml/CloudCredentials.qml
@@ -14,9 +14,9 @@ Item {
 	property string username: login.text;
 	property string password: password.text;
 
-	property real gridWidth: loginWindow.width - Kirigami.Units.gridUnit
-	property real col1Width: gridWidth * 0.80
-	property real col2Width: gridWidth * 0.20
+	property real gridWidth: outerLayout.width
+	property real col1Width: gridWidth * 0.75
+	property real col2Width: gridWidth * 0.25
 
 	function saveCredentials() {
 		manager.cloudUserName = login.text
@@ -27,7 +27,7 @@ Item {
 
 	ColumnLayout {
 		id: outerLayout
-		width: loginWindow.width - loginWindow.leftPadding - loginWindow.rightPadding - 2 * Kirigami.Units.gridUnit
+		width: loginWindow.width
 
 		function goToNext() {
 			for (var i = 0; i < children.length; ++i)
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 06554ceb..7226cee9 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -15,12 +15,10 @@ Kirigami.ScrollablePage {
 	property real gridWidth: settingsPage.width - 2 * Kirigami.Units.gridUnit
 
 	ColumnLayout {
-		width: parent.width - Kirigami.Units.gridUnit
 		CloudCredentials {
 			id: cloudCredentials
 			Layout.fillWidth: true
-			Layout.margins: Kirigami.Units.gridUnit
-			Layout.topMargin: 0
+			Layout.margins: 0
 			property int headingLevel: 4
 		}
 		Rectangle {
-- 
2.13.3