From 37d3c41bed7a1bc2e93ce057013c32e160597477 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Fri, 20 Sep 2019 19:05:43 +0700 Subject: reverse previous commit --- features/LoginPasswordForm.ui.qml | 61 ++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/features/LoginPasswordForm.ui.qml b/features/LoginPasswordForm.ui.qml index 0e1bcd8..69737da 100644 --- a/features/LoginPasswordForm.ui.qml +++ b/features/LoginPasswordForm.ui.qml @@ -62,7 +62,7 @@ Page { sourceSize.width: 24 Layout.leftMargin: 16 fillMode: Image.PreserveAspectFit - source: "../../assets/email-24px.svg" + source: "../assets/email-24px.svg" antialiasing: true } @@ -99,7 +99,7 @@ Page { sourceSize.width: 24 Layout.leftMargin: 16 fillMode: Image.PreserveAspectFit - source: "../../assets/lock-24px.svg" + source: "../components/icons/lock-24px.svg" antialiasing: true } @@ -117,10 +117,57 @@ 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: "../components/icons/arrow-forward-24px.svg" + highlighted: true + enabled: false + } + } } -/*##^## -Designer { - D{i:0;autoSize:true;height:480;width:640} -} -##^##*/ + -- cgit v1.2.3