diff options
| author | Erik Prabowo Kamal <erik@darapsa.co.id> | 2019-08-28 15:46:27 +0800 |
|---|---|---|
| committer | Erik Prabowo Kamal <erik@darapsa.co.id> | 2019-08-28 15:46:27 +0800 |
| commit | ee5558709d02c1b4c9c6bb3e0ed35ec6f61b623a (patch) | |
| tree | 7f7d7cc7935a234ab02ebc17f316bd1e4245315e /pages | |
| parent | 222e2cdd3a64fcdee3b0178e60f097429fe7a242 (diff) | |
| parent | 12544478bc497041aa29efa599ff6583966ae2b6 (diff) | |
Merge remote-tracking branch 'github/development' into development
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/EmailForm.ui.qml | 10 | ||||
| -rw-r--r-- | pages/PasswordForm.ui.qml | 29 |
2 files changed, 25 insertions, 14 deletions
diff --git a/pages/EmailForm.ui.qml b/pages/EmailForm.ui.qml index d9b3b95..f4ab07e 100644 --- a/pages/EmailForm.ui.qml +++ b/pages/EmailForm.ui.qml @@ -4,8 +4,6 @@ import QtQuick.Controls 2.12 Rectangle { id: rectangle - width: 363 - height: 628 color: "#fff" border.width: 0 @@ -34,6 +32,9 @@ Rectangle { icon.color: "transparent" background: Rectangle { + opacity: enabled ? 1.0 : 0.3 + color: backButton.down ? "#ddd" : "#fff" + radius: 6 } } } @@ -111,3 +112,8 @@ Rectangle { } } } + +/*##^## Designer { + D{i:0;autoSize:true;height:480;width:640} +} + ##^##*/ diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml index 5a5875e..f3ee37b 100644 --- a/pages/PasswordForm.ui.qml +++ b/pages/PasswordForm.ui.qml @@ -4,8 +4,6 @@ import QtQuick.Controls 2.12 Rectangle { id: rectangle - width: 363 - height: 628 color: "#fff" border.width: 0 @@ -23,18 +21,20 @@ Rectangle { anchors.left: parent.left anchors.leftMargin: 0 - Rectangle { - id: navIconBg - width: 24 - height: 24 - anchors.left: parent.left - anchors.leftMargin: 16 + Button { + id: backButton anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: 8 + display: AbstractButton.IconOnly + icon.name: "back-icon" + icon.source: "/assets/arrow-back-24px.svg" + icon.color: "transparent" - Button { - id: backButton - display: AbstractButton.IconOnly - anchors.fill: parent + background: Rectangle { + opacity: enabled ? 1.0 : 0.3 + color: backButton.down ? "#ddd" : "#fff" + radius: 6 } } } @@ -114,3 +114,8 @@ Rectangle { } } } + +/*##^## Designer { + D{i:0;autoSize:true;height:480;width:640} +} + ##^##*/ |