Merge pull request #1793

85cd428 Merchant page (xmrdsc)
2019-01-09 17:43:31 -06:00
parent 97de72b27d 85cd428dcb
commit 5a682b37ec
28 changed files with 1250 additions and 452 deletions
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -103,7 +103,7 @@ Rectangle {

    ColumnLayout {
      id: pageRoot
-      anchors.margins: (isMobile)? 17 : 20
+      anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio
      anchors.topMargin: 40 * scaleRatio

      anchors.left: parent.left
@@ -421,7 +421,7 @@ Rectangle {
        anchors.top: pageRoot.bottom
        anchors.left: parent.left
        anchors.right: parent.right
-        anchors.margins: (isMobile)? 17 : 20
+        anchors.margins: (isMobile)? 17 * scaleRatio : 20 * scaleRatio
        anchors.topMargin: 32 * scaleRatio
        spacing: 26 * scaleRatio
        enabled: !viewOnly || pageRoot.enabled