diff options
-rw-r--r-- | LoginForm.ui.qml | 64 | ||||
-rw-r--r-- | kelakon.qrc | 4 | ||||
-rw-r--r-- | onboarding-1.png | bin | 0 -> 114484 bytes |
3 files changed, 42 insertions, 26 deletions
diff --git a/LoginForm.ui.qml b/LoginForm.ui.qml index bea97df..36d2d2f 100644 --- a/LoginForm.ui.qml +++ b/LoginForm.ui.qml @@ -10,26 +10,24 @@ Rectangle { property alias googleButton: googleButton property alias emailButton: emailButton - RowLayout { - anchors.horizontalCenter: parent.horizontalCenter - anchors.left: parent.left + ColumnLayout { anchors.right: parent.right - anchors.leftMargin: 16 anchors.rightMargin: 16 + anchors.left: parent.left + anchors.leftMargin: 16 anchors.bottom: disclaimer.top anchors.bottomMargin: 16 + spacing: 16 Button { - id: emailButton - text: qsTr("Continue with E-Mail") + id: googleButton + text: qsTr("Continue with Google") height: 36 - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom + Layout.fillWidth: true contentItem: Text { - text: emailButton.text - color: "#6d22e9" + text: googleButton.text + color: "#FFF" font.pointSize: 14 font.family: "Google Sans" horizontalAlignment: Text.AlignHCenter @@ -37,27 +35,21 @@ Rectangle { elide: Text.ElideRight } background: Rectangle { - color: "#fff" - border.color: "#6d22e9" - border.width: 1 + opacity: enabled ? 1.0 : 0.3 + color: googleButton.down ? "#6d22e9" : "#4F12DA" radius: 6 } } Button { - id: googleButton - text: qsTr("Continue with Google") - y: 419 + id: emailButton + text: qsTr("Continue with E-Mail") height: 36 - - anchors.right: parent.right - anchors.left: parent.left - anchors.bottom: emailButton.top - anchors.bottomMargin: 16 + Layout.fillWidth: true contentItem: Text { - text: googleButton.text - color: "#FFF" + text: emailButton.text + color: "#6d22e9" font.pointSize: 14 font.family: "Google Sans" horizontalAlignment: Text.AlignHCenter @@ -65,8 +57,10 @@ Rectangle { elide: Text.ElideRight } background: Rectangle { - opacity: enabled ? 1.0 : 0.3 - color: googleButton.down ? "#6d22e9" : "#4F12DA" + opacity: enabled ? 0.3 : 1 + color: emailButton.down ? "#6d22e9" : "#ffffff" + border.color: "#6d22e9" + border.width: 1 radius: 6 } } @@ -102,4 +96,22 @@ Rectangle { fillMode: Image.PreserveAspectFit source: "kelakon-logo.png" } + + Image { + id: image + height: 172 + anchors.right: parent.right + anchors.rightMargin: 94 + anchors.left: parent.left + anchors.leftMargin: 94 + anchors.top: parent.top + anchors.topMargin: 72 + source: "onboarding-1.png" + fillMode: Image.PreserveAspectFit + } +} + +/*##^## Designer { + D{i:10;anchors_width:100;anchors_x:130;anchors_y:69} } + ##^##*/ diff --git a/kelakon.qrc b/kelakon.qrc index 0ca9dd7..a3c2a2a 100644 --- a/kelakon.qrc +++ b/kelakon.qrc @@ -4,7 +4,11 @@ <file>Login.qml</file> <file>LoginForm.ui.qml</file> <file>kelakon-logo.png</file> +<<<<<<< HEAD + <file>onboarding-1.png</file> +======= <file>pages/Email.qml</file> <file>pages/EmailForm.ui.qml</file> +>>>>>>> 2679bcec2d5938125634d970f025518c42498628 </qresource> </RCC> diff --git a/onboarding-1.png b/onboarding-1.png Binary files differnew file mode 100644 index 0000000..dce5270 --- /dev/null +++ b/onboarding-1.png |