Fix the column layout margins

1 files changed, 280 insertions, 279 deletions

diff --git a/InstructorEditProfile.ui.qml b/InstructorEditProfile.ui.qml
index e58abbf..f138a45 100644
--- a/InstructorEditProfile.ui.qml
+++ b/InstructorEditProfile.ui.qml
@@ -78,108 +78,84 @@ Flickable {
 						}
 
 						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
+							Layout.topMargin: -9.6
+							Layout.leftMargin: 7.2
+							Layout.rightMargin: 7.2
 							Layout.bottomMargin: 16
 
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Profile picture")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
+
+								Label {
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Profile picture")
+									color: "#747579"
+									font {
+										family: doesntEmbed ? "Roboto" : regular.name
+										pointSize: 15
+									}
 								}
-							}
 
-							RowLayout {
+								RowLayout {
 
-								Image {
-									id: avatar
-									Layout.rightMargin: 25.6
-									source: "https://eduport.webestica.com/assets/images/avatar/07.jpg"
-									sourceSize {
-										width: 82
-										height: 82
-									}
-									layer.enabled: true
-									layer.effect: OpacityMask {
-										maskSource: Rectangle {
+									Image {
+										id: avatar
+										Layout.rightMargin: 25.6
+										source: "https://eduport.webestica.com/assets/images/avatar/07.jpg"
+										sourceSize {
 											width: 82
 											height: 82
-											radius: 82
+										}
+										layer.enabled: true
+										layer.effect: OpacityMask {
+											maskSource: Rectangle {
+												width: 82
+												height: 82
+												radius: 82
+											}
 										}
 									}
-								}
 
-								Button {
-									id: uploadButton
-									horizontalPadding: 16
-									verticalPadding: 8
-									contentItem: Text {
-										color: uploadButton.down ? "#ffffff" : "#066ac9"
-										text: qsTr("Change")
-										horizontalAlignment: Text.AlignHCenter
-										verticalAlignment: Text.AlignVCenter
-										font {
-											family: doesntEmbed ? "Roboto" : medium.name
-											weight: Font.Medium
-											pointSize: 15
+									Button {
+										id: uploadButton
+										horizontalPadding: 16
+										verticalPadding: 8
+										contentItem: Text {
+											color: uploadButton.down ? "#ffffff" : "#066ac9"
+											text: qsTr("Change")
+											horizontalAlignment: Text.AlignHCenter
+											verticalAlignment: Text.AlignVCenter
+											font {
+												family: doesntEmbed ? "Roboto" : medium.name
+												weight: Font.Medium
+												pointSize: 15
+											}
 										}
-									}
-									background: Rectangle {
-										radius: 5.2
-										color: uploadButton.down ? "#066ac9" : Qt.rgba(.0235, .416, .788, .1)
-										border {
-											color: uploadButton.down ? "#066ac9" : "transparent"
-											width: 1
+										background: Rectangle {
+											radius: 5.2
+											color: uploadButton.down ? "#066ac9" : Qt.rgba(.0235, .416, .788, .1)
+											border {
+												color: uploadButton.down ? "#066ac9" : "transparent"
+												width: 1
+											}
 										}
 									}
 								}
 							}
-						}
 
-						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
-							Layout.bottomMargin: 16
-
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Full name")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
-								}
-							}
-
-							Rectangle {
-								Layout.fillWidth: true
-								implicitHeight: firstName.height
-								radius: 5.2
-								border {
-									width: 1
-									color: "#dde0e3"
-								}
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
 
-								TextField {
-									id: firstName
-									text: "Lori"
-									placeholderText: qsTr("First name")
-									width: parent.width / 2
-									anchors.left: parent.left
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									background: Rectangle {
-										color: "transparent"
-									}
+								Label {
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Full name")
+									color: "#747579"
 									font {
 										family: doesntEmbed ? "Roboto" : regular.name
 										pointSize: 15
@@ -187,76 +163,74 @@ Flickable {
 								}
 
 								Rectangle {
-									width: 1
-									height: firstName.height
-									anchors.horizontalCenter: parent.horizontalCenter
+									Layout.fillWidth: true
+									implicitHeight: firstName.height
+									radius: 5.2
 									border {
-										width: .5
-										color: "#88dde0e3"
+										width: 1
+										color: "#dde0e3"
 									}
-								}
 
-								TextField {
-									id: lastName
-									text: "Stevens"
-									placeholderText: qsTr("Last name")
-									width: parent.width / 2
-									anchors.right: parent.right
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									background: Rectangle {
-										color: "transparent"
-									}
-									font {
-										family: doesntEmbed ? "Roboto" : regular.name
-										pointSize: 15
+									TextField {
+										id: firstName
+										text: "Lori"
+										placeholderText: qsTr("First name")
+										width: parent.width / 2
+										anchors.left: parent.left
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
 									}
-								}
-							}
-						}
 
-						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
-							Layout.bottomMargin: 16
+									Rectangle {
+										width: 1
+										height: firstName.height
+										anchors.horizontalCenter: parent.horizontalCenter
+										border {
+											width: .5
+											color: "#88dde0e3"
+										}
+									}
 
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Username")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
+									TextField {
+										id: lastName
+										text: "Stevens"
+										placeholderText: qsTr("Last name")
+										width: parent.width / 2
+										anchors.right: parent.right
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
+									}
 								}
 							}
 
-							Rectangle {
-								Layout.fillWidth: true
-								implicitHeight: userName.height
-								radius: 5.2
-								border {
-									width: 1
-									color: "#dde0e3"
-								}
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
 
 								Label {
-									id: domainName
-									text: "Eduport.com"
-									height: userName.height
-									width: parent.width / 2
-									anchors.left: parent.left
-									verticalAlignment: Text.AlignVCenter
-									topPadding: 6
-									leftPadding: 12
-									rightPadding: 12
-									bottomPadding: 6
-									background: Rectangle {
-										color: "#e9ecef"
-									}
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Username")
+									color: "#747579"
 									font {
 										family: doesntEmbed ? "Roboto" : regular.name
 										pointSize: 15
@@ -264,178 +238,205 @@ Flickable {
 								}
 
 								Rectangle {
-									width: 1
-									height: userName.height
-									anchors.horizontalCenter: parent.horizontalCenter
+									Layout.fillWidth: true
+									implicitHeight: userName.height
+									radius: 5.2
 									border {
-										width: .5
-										color: "#88dde0e3"
+										width: 1
+										color: "#dde0e3"
 									}
-								}
 
-								TextField {
-									id: userName
-									text: "loristev"
-									width: parent.width / 2
-									anchors.right: parent.right
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									background: Rectangle {
-										color: "transparent"
-									}
-									font {
-										family: doesntEmbed ? "Roboto" : regular.name
-										pointSize: 15
+									Label {
+										id: domainName
+										text: "Eduport.com"
+										height: userName.height
+										width: parent.width / 2
+										anchors.left: parent.left
+										verticalAlignment: Text.AlignVCenter
+										topPadding: 6
+										leftPadding: 12
+										rightPadding: 12
+										bottomPadding: 6
+										background: Rectangle {
+											color: "#e9ecef"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
 									}
-								}
-							}
-						}
 
-						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
-							Layout.bottomMargin: 16
+									Rectangle {
+										width: 1
+										height: userName.height
+										anchors.horizontalCenter: parent.horizontalCenter
+										border {
+											width: .5
+											color: "#88dde0e3"
+										}
+									}
 
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Email id")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
+									TextField {
+										id: userName
+										text: "loristev"
+										width: parent.width / 2
+										anchors.right: parent.right
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
+									}
 								}
 							}
 
-							Rectangle {
-								Layout.fillWidth: true
-								implicitHeight: emailID.height
-								radius: 5.2
-								border {
-									width: 1
-									color: "#dde0e3"
-								}
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
 
-								TextField {
-									id: emailID
-									text: "example@gmail.com"
-									placeholderText: qsTr("Email")
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									anchors {
-										left: parent.left
-										right: parent.right
-									}
-									background: Rectangle {
-										color: "transparent"
-									}
+								Label {
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Email id")
+									color: "#747579"
 									font {
 										family: doesntEmbed ? "Roboto" : regular.name
 										pointSize: 15
 									}
 								}
-							}
-						}
 
-						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
-							Layout.bottomMargin: 16
+								Rectangle {
+									Layout.fillWidth: true
+									implicitHeight: emailID.height
+									radius: 5.2
+									border {
+										width: 1
+										color: "#dde0e3"
+									}
 
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Phone number")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
+									TextField {
+										id: emailID
+										text: "example@gmail.com"
+										placeholderText: qsTr("Email")
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										anchors {
+											left: parent.left
+											right: parent.right
+										}
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
+									}
 								}
 							}
 
-							Rectangle {
-								Layout.fillWidth: true
-								implicitHeight: phoneNumber.height
-								radius: 5.2
-								border {
-									width: 1
-									color: "#dde0e3"
-								}
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
 
-								TextField {
-									id: phoneNumber
-									text: "1234567890"
-									placeholderText: qsTr("Phone number")
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									anchors {
-										left: parent.left
-										right: parent.right
-									}
-									background: Rectangle {
-										color: "transparent"
-									}
+								Label {
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Phone number")
+									color: "#747579"
 									font {
 										family: doesntEmbed ? "Roboto" : regular.name
 										pointSize: 15
 									}
 								}
-							}
-						}
 
-						ColumnLayout {
-							Layout.topMargin: 16
-							Layout.leftMargin: 20
-							Layout.rightMargin: 20
-							Layout.bottomMargin: 16
+								Rectangle {
+									Layout.fillWidth: true
+									implicitHeight: phoneNumber.height
+									radius: 5.2
+									border {
+										width: 1
+										color: "#dde0e3"
+									}
 
-							Label {
-								Layout.fillWidth: true
-								Layout.bottomMargin: 8
-								text: qsTr("Location")
-								color: "#747579"
-								font {
-									family: doesntEmbed ? "Roboto" : regular.name
-									pointSize: 15
+									TextField {
+										id: phoneNumber
+										text: "1234567890"
+										placeholderText: qsTr("Phone number")
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										anchors {
+											left: parent.left
+											right: parent.right
+										}
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
+									}
 								}
 							}
 
-							Rectangle {
-								Layout.fillWidth: true
-								implicitHeight: location.height
-								radius: 5.2
-								border {
-									width: 1
-									color: "#dde0e3"
-								}
+							ColumnLayout {
+								Layout.topMargin: 25.6
+								Layout.leftMargin: 12.8
+								Layout.rightMargin: 12.8
 
-								TextField {
-									id: location
-									text: "California"
-									topPadding: 8
-									leftPadding: 16
-									rightPadding: 16
-									bottomPadding: 8
-									anchors {
-										left: parent.left
-										right: parent.right
-									}
-									background: Rectangle {
-										color: "transparent"
-									}
+								Label {
+									Layout.fillWidth: true
+									Layout.bottomMargin: 8
+									text: qsTr("Location")
+									color: "#747579"
 									font {
 										family: doesntEmbed ? "Roboto" : regular.name
 										pointSize: 15
 									}
 								}
+
+								Rectangle {
+									Layout.fillWidth: true
+									implicitHeight: location.height
+									radius: 5.2
+									border {
+										width: 1
+										color: "#dde0e3"
+									}
+
+									TextField {
+										id: location
+										text: "California"
+										topPadding: 8
+										leftPadding: 16
+										rightPadding: 16
+										bottomPadding: 8
+										anchors {
+											left: parent.left
+											right: parent.right
+										}
+										background: Rectangle {
+											color: "transparent"
+										}
+										font {
+											family: doesntEmbed ? "Roboto" : regular.name
+											pointSize: 15
+										}
+									}
+								}
 							}
 						}
 					}