summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-09-20 18:58:14 +0700
committerAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-09-20 18:58:14 +0700
commit0f8368edbaa8347cf8a5caca31c1a1c5d899f600 (patch)
tree0bbd469bbe6df2ad7aa77b4973ddf78874e4c890
parent28a059393fd6dd680ccb0706c09d43b17ca293b9 (diff)
remove `continueLayout`
-rw-r--r--features/LoginEmailForm.ui.qml55
-rw-r--r--features/LoginPasswordForm.ui.qml55
2 files changed, 4 insertions, 106 deletions
diff --git a/features/LoginEmailForm.ui.qml b/features/LoginEmailForm.ui.qml
index 5a2d0bf..d8bcc09 100644
--- a/features/LoginEmailForm.ui.qml
+++ b/features/LoginEmailForm.ui.qml
@@ -7,7 +7,6 @@ Page {
id: page
title: qsTr("Log in")
- property alias continueButton: continueButton
property alias emailTextField: emailTextField
Text {
@@ -48,8 +47,8 @@ Page {
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
- anchors.bottom: continueLayout.top
- anchors.bottomMargin: 16
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
spacing: 8
height: 56
@@ -79,56 +78,6 @@ Page {
color: "#000000"
}
}
- RowLayout {
- id: continueLayout
- height: 80
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 0
- anchors.right: parent.right
- anchors.rightMargin: 0
- anchors.left: parent.left
- anchors.leftMargin: 0
-
- Text {
- id: disclaimer
- text: qsTr("By continuing, you are agree to our Terms of Use and Privacy Policy.")
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- font.family: "Roboto"
- font.pointSize: 12
- color: "#FA000000"
- wrapMode: Text.WordWrap
- verticalAlignment: Text.AlignVCenter
- rightPadding: 0
- leftPadding: 0
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- }
-
- RoundButton {
- id: continueButton
- width: 72
- height: 72
- Layout.preferredHeight: 64
- Layout.preferredWidth: 64
- Layout.minimumHeight: 64
- Layout.minimumWidth: 64
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- flat: false
- rightPadding: 0
- leftPadding: 0
- bottomPadding: 0
- topPadding: 0
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- Material.background: Material.primary
- display: AbstractButton.IconOnly
- icon.name: "arrow-forward-icon"
- icon.source: "../components/icons/arrow-forward-24px.svg"
- highlighted: true
- enabled: false
- }
- }
}
/*##^##
Designer {
diff --git a/features/LoginPasswordForm.ui.qml b/features/LoginPasswordForm.ui.qml
index 4ddf493..0e1bcd8 100644
--- a/features/LoginPasswordForm.ui.qml
+++ b/features/LoginPasswordForm.ui.qml
@@ -7,7 +7,6 @@ Page {
id: page
title: qsTr("Log in")
- property alias continueButton: continueButton
property alias emailTextLabel: emailTextLabel
property alias passwordTextField: passwordTextField
@@ -86,8 +85,8 @@ Page {
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
- anchors.bottom: continueLayout.top
- anchors.bottomMargin: 16
+ anchors.bottom: parent.bottom
+ anchors.bottomMargin: 0
spacing: 8
height: 56
@@ -118,56 +117,6 @@ Page {
echoMode: TextInput.Password
}
}
- RowLayout {
- id: continueLayout
- height: 80
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 0
- anchors.right: parent.right
- anchors.rightMargin: 0
- anchors.left: parent.left
- anchors.leftMargin: 0
-
- Text {
- id: disclaimer
- text: qsTr("By continuing, you are agree to our Terms of Use and Privacy Policy.")
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- font.family: "Roboto"
- font.pointSize: 12
- color: "#FA000000"
- wrapMode: Text.WordWrap
- verticalAlignment: Text.AlignVCenter
- rightPadding: 0
- leftPadding: 0
- Layout.alignment: Qt.AlignVCenter
- Layout.fillWidth: true
- }
-
- RoundButton {
- id: continueButton
- width: 72
- height: 72
- Layout.preferredHeight: 64
- Layout.preferredWidth: 64
- Layout.minimumHeight: 64
- Layout.minimumWidth: 64
- Layout.rightMargin: 16
- Layout.leftMargin: 16
- flat: false
- rightPadding: 0
- leftPadding: 0
- bottomPadding: 0
- topPadding: 0
- Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
- Material.background: Material.primary
- display: AbstractButton.IconOnly
- icon.name: "arrow-forward-icon"
- icon.source: "../../assets/arrow-forward-24px.svg"
- highlighted: true
- enabled: false
- }
- }
}
/*##^##
Designer {