Cleanup after rebase

2018-01-12 01:17:20 +01:00
parent cf2791a246
commit a9b6a70d15
5 changed files with 21 additions and 33 deletions
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -168,14 +168,15 @@ Rectangle {
                    }
                }
            }
+        }
+
+        RowLayout{
+            Layout.fillWidth: true

            StandardButton {
                id: changePasswordButton
+                small: true
                text: qsTr("Change password") + translationManager.emptyString
-                shadowReleasedColor: "#FF4304"
-                shadowPressedColor: "#B32D00"
-                releasedColor: "#FF6C3C"
-                pressedColor: "#FF4304"
                onClicked: {
                    passwordDialog.onAcceptedCallback = function() {
                        if(appWindow.walletPassword === passwordDialog.password){