Cleanup after rebase

This commit is contained in:
Sander Ferdinand
2018-01-12 01:17:20 +01:00
committed by moneromooo-monero
parent cf2791a246
commit a9b6a70d15
5 changed files with 21 additions and 33 deletions

View File

@@ -224,10 +224,6 @@ Item {
MoneroComponents.StandardButton {
id: cancelButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Cancel") + translationManager.emptyString
KeyNavigation.tab: passwordInput1
onClicked: {
@@ -237,10 +233,6 @@ Item {
}
MoneroComponents.StandardButton {
id: okButton
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
text: qsTr("Continue")
KeyNavigation.tab: cancelButton
enabled: passwordInput1.text === passwordInput2.text

View File

@@ -120,7 +120,7 @@ Rectangle {
font.family: "Arial"
textFormat: TextEdit.AutoText
readOnly: true
font.pixelSize: 12 * scaleRatio
font.pixelSize: 14 * scaleRatio
selectByMouse: false
wrapMode: TextEdit.Wrap
textColor: Style.defaultFontColor