From 916c7acbb7f0bb658acd3ea050ea4b04581374e2 Mon Sep 17 00:00:00 2001
From: Sander Ferdinand <sa.ferdinand@gmail.com>
Date: Wed, 21 Mar 2018 23:58:51 +0100
Subject: [PATCH] Design polish work

---
 main.qml          |  1 -
 pages/History.qml | 13 +++++++++++--
 pages/Keys.qml    |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/main.qml b/main.qml
index 9cb3bc34..4d69d217 100644
--- a/main.qml
+++ b/main.qml
@@ -286,7 +286,6 @@ ApplicationWindow {
             informationPopup.onCloseCallback = function() {
                 appWindow.close();
             }
-            return;
         }
 
         walletName = usefulName(wallet.path)
diff --git a/pages/History.qml b/pages/History.qml
index a1f3142a..f6fe8736 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -133,15 +133,24 @@ Rectangle {
         spacing: 0
 
         GridLayout {
-            columns: (isMobile)? 1 : 2
+            property int column_width: {
+                if(!isMobile){
+                    return (parent.width / 2) - 20;
+                } else {
+                    return parent.width - 20;
+                }
+            }
+
+            columns: 2
             Layout.fillWidth: true
-            columnSpacing: 26 * scaleRatio
 
             RowLayout {
                 visible: !isMobile
+                Layout.preferredWidth: parent.column_width
             }
 
             RowLayout {
+                Layout.preferredWidth: parent.column_width
                 LineEdit {
                     id: searchLine
                     fontSize: 14 * scaleRatio
diff --git a/pages/Keys.qml b/pages/Keys.qml
index 50928579..37ea3060 100644
--- a/pages/Keys.qml
+++ b/pages/Keys.qml
@@ -187,6 +187,7 @@ Rectangle {
                 Layout.fillWidth: true
                 font.bold: true
                 font.pixelSize: 16 * scaleRatio
+                color: Style.defaultFontColor
                 text: (viewOnlyQRCode.visible) ? qsTr("View Only Wallet") + translationManager.emptyString : qsTr("Spendable Wallet") + translationManager.emptyString
                 horizontalAlignment: Text.AlignHCenter
             }