Material components revamp

1 files changed, 7 insertions, 25 deletions

diff --git a/pages/PasswordForm.ui.qml b/pages/PasswordForm.ui.qml
index f3ee37b..eceb1f8 100644
--- a/pages/PasswordForm.ui.qml
+++ b/pages/PasswordForm.ui.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
 
 Rectangle {
     id: rectangle
@@ -74,47 +75,28 @@ Rectangle {
         anchors.leftMargin: 16
         Layout.maximumHeight: 56
         echoMode: TextInput.Password
-
-        background: Rectangle {
-            color: passTextField.enabled ? "#f4f4f4" : "#353637"
-            anchors.verticalCenter: parent.verticalCenter
-            implicitHeight: 56
-            radius: 6
-        }
     }
 
     Button {
         id: createPassButton
         x: 34
         y: 278
-        width: 296
-        height: 36
         text: qsTr("Confirm password")
+        font.family: "Google Sans"
         anchors.right: parent.right
         anchors.rightMargin: 16
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 16
         anchors.left: parent.left
         anchors.leftMargin: 16
-
-        contentItem: Text {
-            text: createPassButton.text
-            color: "#FFF"
-            font.pointSize: 14
-            font.family: "Google Sans"
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-            elide: Text.ElideRight
-        }
-
-        background: Rectangle {
-            opacity: enabled ? 1.0 : 0.3
-            color: createPassButton.down ? "#6d22e9" : "#4F12DA"
-            radius: 6
-        }
+        highlighted: true
+        Material.accent: Material.primary
     }
 }
 
+
+
+
 /*##^## Designer {
     D{i:0;autoSize:true;height:480;width:640}
 }