Fix pref styling: export and paper wallet

public/views/export.html

@@ -6,20 +6,27 @@
 
 
 
-<div class="content p20v" ng-controller="backupController as backup">
+<div class="content preferences" ng-controller="backupController as backup">
-  <div class="row">
+  <h4></h4>
-    <div class="columns" ng-show="!backup.backupWalletPlainText">
+  <div ng-show="!backup.backupWalletPlainText">
       <div class="text-warning size-14 m20b" ng-show="backup.error">
         <i class="fi-alert size-12"></i>
         <span translate> Failed to export </span>
       </div>
 
+      <div class="row">
+        <div class="columns">
           <div class="text-warning size-14 m20b" ng-show="backup.isEncrypted">
             <i class="fi-alert size-12"></i>
             <span translate> The private key for this wallet is encrypted. Exporting keep the private key encrypted in the export archive.</span>
 
           </div>
+        </div>
+      </div>
 
+      <form>
+        <div class="row">
+          <div class="columns">
             <label for="password" translate>Set up a Export Password </label>
             <div class="input">
               <input type="password" class="form-control"
@@ -33,16 +40,17 @@
                                      placeholder="{{'Repeat password'|translate}}"
                                      name="password" ng-model="backup.repeatpassword">
             </div>
+          </div>
+        </div>
+      </form>
 
-
+      <h4></h4>
-      <div class="row" ng-hide="index.isPrivKeyExternal">
+      <ul class="no-bullet m0" ng-hide="index.isPrivKeyExternal">
-        <div class="large-12 columns">
+        <li>
-          <label for="no-sign" class="line-b oh">
+        <switch id="no-sign" name="noSign" ng-model="noSign" class="green right"></switch>
         <span translate>Do not include private key</span>
-            <switch id="no-sign" name="noSign" ng-model="noSign" class="green right m5t m10b"></switch>
+        </li>
-          </label>
+      </ul>
-        </div>
-      </div>
 
 
       <div class="box-notification"  ng-show="index.isPrivKeyExternal">
@@ -65,12 +73,14 @@
       </div>
 
 
-      <button class="black round expand m0" ng-click="backup.downloadWalletBackup()"
+      <div class="row">
+        <div class="columns">
+          <button class="black round expand m20t" ng-click="backup.downloadWalletBackup()"
             ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
             ng-style="{'background-color':index.backgroundColor}"
             ng-show="!index.isSafari && !index.isCordova"><i class="fi-download"></i>
             <span translate>Download</span></button>
-      <button class="black round expand m0" ng-click="backup.viewWalletBackup()"
+          <button class="black round expand m20t" ng-click="backup.viewWalletBackup()"
             ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
             ng-style="{'background-color':index.backgroundColor}"
             ng-show="index.isSafari && !index.isCordova"><i class="fi-eye"></i>
@@ -81,7 +91,7 @@
               ng-style="{'background-color':index.backgroundColor}"
               ng-click="backup.copyWalletBackup()"><i class="fi-clipboard-pencil"></i>
               <span translate>Copy to clipboard</span></button>
-        <button class="black round expand m0" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
+            <button class="black round expand" ng-disabled="(!backup.password || backup.password != backup.repeatpassword)"
               ng-style="{'background-color':index.backgroundColor}"
               ng-click="backup.sendWalletBackup()"><i class="fi-mail"></i>
               <span translate>Send by email</span></button>
@@ -89,6 +99,8 @@
         </div>
       </div>
     
+  </div>
+
   <div class="row" ng-show="backup.backupWalletPlainText">
     <div class="large-12 columns">
       <h3 translate>Wallet Export</h3>

public/views/paperWallet.html

@@ -4,7 +4,8 @@
   ng-init="titleSection='Sweep paper wallet'; goBackToState = 'preferencesAdvanced';">
 </div>
 
-<div class="content p20v" ng-controller="paperWalletController as paperWallet">
+<div class="content preferences" ng-controller="paperWalletController as paperWallet">
+  <h4 ng-show="!paperWallet.error"></h4>
   <div class="onGoingProcess" ng-show="paperWallet.scanning || paperWallet.sending">
     <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
       <div class="spinner">
@@ -22,7 +23,8 @@
     <i class="fi-alert size-12"></i>
     <span>{{paperWallet.error|translate}}</span>
   </div>
-  <div ng-show="!paperWallet.balance" class="row">
+  <form ng-show="!paperWallet.balance" class="oh">
+    <div class="row">
       <div class="large-12 medium-12 columns">  
         <div class="input">
           <label for="inputData" translate>Paper Wallet Private Key</label>
@@ -49,6 +51,7 @@
         </div> 
       </div>
     </div>
+  </form>
   <div ng-show="paperWallet.balance" class="row">
      <div class="large-12 medium-12 columns">
        <div class="text-center m20b">