diff --git a/app/qml/onboarding/MMLogin.qml b/app/qml/onboarding/MMLogin.qml index 507498232..e21033cef 100644 --- a/app/qml/onboarding/MMLogin.qml +++ b/app/qml/onboarding/MMLogin.qml @@ -16,6 +16,8 @@ import "../inputs" Page { id: root + width: parent.width + signal backClicked signal signInClicked signal signUpClicked @@ -41,78 +43,86 @@ Page { } } - Column { - id: mainColumn + ScrollView { + width: parent.width + height: parent.height - changeServerButton.height - anchors.fill: parent - spacing: 20 * __dp - padding: 20 * __dp + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + ScrollBar.vertical.policy: ScrollBar.AlwaysOff - MMHeader { - width: parent.width - 2 * mainColumn.padding - headerTitle: qsTr("Log In") - titleFont: __style.h3 - backColor: __style.lightGreenColor + Column { + id: mainColumn - onBackClicked: root.backClicked() - } + width: root.width + spacing: 20 * __dp + padding: 20 * __dp - Item { width: 1; height: 1 } + MMHeader { + width: parent.width - 2 * mainColumn.padding + headerTitle: qsTr("Log In") + titleFont: __style.h3 + backColor: __style.lightGreenColor - MMInputEditor { - width: parent.width - 2 * mainColumn.padding - title: qsTr("Username") - bgColor: __style.lightGreenColor - } + onBackClicked: root.backClicked() + } - MMPasswordEditor { - width: parent.width - 2 * mainColumn.padding - title: qsTr("Password") - bgColor: __style.lightGreenColor - } + Item { width: 1; height: 1 } - MMLink { - width: parent.width - 2 * mainColumn.padding - height: 20 * __dp - text: qsTr("Forgot password?") + MMInputEditor { + width: parent.width - 2 * mainColumn.padding + title: qsTr("Username") + bgColor: __style.lightGreenColor + } - onClicked: root.signInClicked() - } + MMPasswordEditor { + width: parent.width - 2 * mainColumn.padding + title: qsTr("Password") + bgColor: __style.lightGreenColor + } - Item { width: 1; height: 1 } + MMLink { + width: parent.width - 2 * mainColumn.padding + height: 20 * __dp + text: qsTr("Forgot password?") - MMButton { - width: parent.width - 2 * mainColumn.padding - text: qsTr("Sign in") + onClicked: root.signInClicked() + } - onClicked: root.signInClicked() - } + Item { width: 1; height: 1 } - Item { width: 1; height: 1 } + MMButton { + width: parent.width - 2 * mainColumn.padding + text: qsTr("Sign in") - MMHlineText { - width: parent.width - 2 * mainColumn.padding - title: qsTr("Don't have an account?") - } + onClicked: root.signInClicked() + } - MMLinkButton { - width: parent.width - 2 * mainColumn.padding - text: qsTr("Sign up") + Item { width: 1; height: 1 } - onClicked: root.signUpClicked() - } + MMHlineText { + width: parent.width - 2 * mainColumn.padding + title: qsTr("Don't have an account?") + } - Item { width: 1; height: 1 } + MMLinkButton { + width: parent.width - 2 * mainColumn.padding + text: qsTr("Sign up") - MMLink { - id: changeServerButton + onClicked: root.signUpClicked() + } + } + } - width: parent.width - 2 * mainColumn.padding - text: "https://app.merginmaps.com/" - leftIcon: __style.globeIcon + MMLink { + id: changeServerButton - onClicked: changeServerDrawer.visible = true - } + width: parent.width + height: 50 * __dp + anchors.bottom: parent.bottom + text: "https://app.merginmaps.com/" + leftIcon: __style.globeIcon + + onClicked: changeServerDrawer.visible = true } MMDrawer {