From 7c15b70605e6bd86da2b38516ff3cec45aa4d3d0 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Thu, 18 Aug 2016 17:13:14 -0300
Subject: [PATCH] Fix Import UI

---
 public/views/import.html | 40 +++++++++++++++++++++++++---------------
 public/views/join.html   |  4 ++--
 src/sass/main.scss       |  8 +++++++-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/public/views/import.html b/public/views/import.html
index fc1b8312d..5c048895b 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -56,15 +56,22 @@
 
       <form name="importForm12" ng-submit="importMnemonic(importForm12)" novalidate>
         <div class="list">
-          <qr-scanner class="button button-clear button-positive" on-scan="processWalletInfo(data)"></qr-scanner>
-          <label class="item item-input item-stacked-label">
-            <span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span>
-            <textarea name="words"
-                      ng-model="words"
-                      rows="3"
-                      autocapitalize="off"
-                      spellcheck="false"></textarea>
-          </label>
+
+          <div class="row">
+            <div class="col col-90">
+              <label class="item item-input item-stacked-label no-border">
+                <span class="input-label" translate>Type the Recovery Phrase (usually 12 words)</span>
+                <textarea name="words"
+                          ng-model="words"
+                          rows="3"
+                          autocapitalize="off"
+                          spellcheck="false"></textarea>
+              </label>
+            </div>
+            <div class="col text-center">
+              <qr-scanner class="qr-icon size-24" on-scan="join.onQrCodeScanned(data)"></qr-scanner>
+            </div>
+          </div>
 
           <ion-toggle ng-model="showAdv" toggle-class="toggle-stable">
             <span translate ng-show="!showAdv">Show advanced options</span>
@@ -116,12 +123,15 @@
       <form name="importForm" ng-submit="importBlob(importForm)" novalidate>
 
         <div class="list">
-          <label class="item item-input item-stacked-label" ng-show="!index.isSafari && !index.isCordova">
-            <span class="input-label" translate>Choose a backup file from your computer</span>
-            <input type="file"
-                   placeholder="{{'Select a backup file'|translate}}"
-                   name="backupFile"
-                   ng-model="backupFile" ng-file-select>
+
+          <label class="item item-input item-stacked-label no-border" ng-show="!index.isSafari && !index.isCordova">
+            <div class="input-label" translate>Choose a backup file from your computer</div>
+            <div >
+              <input type="file"
+              placeholder="{{'Select a backup file'|translate}}"
+              name="backupFile"
+              ng-model="backupFile" ng-file-select>
+            </div>
           </label>
 
           <label class="item item-input item-stacked-label" ng-show="index.isSafari || index.isCordova">
diff --git a/public/views/join.html b/public/views/join.html
index f362e0c90..008f2eb51 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -18,7 +18,7 @@
 
         <div class="row">
           <div class="col">
-            <label class="item item-input item-stacked-label item-border-off">
+            <label class="item item-input item-stacked-label no-border">
               <span class="input-label" translate>Your nickname</span>
               <input type="text"
               placeholder="{{'John'|translate}}"
@@ -31,7 +31,7 @@
 
         <div class="row">
           <div class="col col-90">
-            <label class="item item-input item-stacked-label item-border-off">
+            <label class="item item-input item-stacked-label no-border">
               <span class="input-label" translate>Wallet Invitation</span>
               <i class="icon ion-checkmark-circled balanced" ng-show="joinForm.secret.$valid &&
               !joinForm.secret.$pristine && secret"></i>
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 2e53a22ae..c0b3e914a 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -934,10 +934,16 @@ ul.wallet-selection.wallets {
   line-height: 45px;
 }
 
-.item-border-off {
+.no-border {
   border-style: none;
 }
 
+input[type=file] {
+  margin-top: 10px;
+  margin-bottom: -10px;
+  line-height: 0px;
+}
+
 /*
  * Calculator
  */