Merge pull request #3292 from matiu/feat/pref-style

Feat/pref style

public/views/backup.html

@@ -5,7 +5,8 @@
 </div>
 
 
-<div class="content p20v" ng-controller="wordsController as wordsC">
+<div class="content preferences" ng-controller="wordsController as wordsC">
+  <h4></h4>
 
 
   <div class="box-notification" ng-show="wordsC.error">
@@ -82,7 +83,7 @@
 
     <div class="row" ng-show="wordsC.show">
         <div class="columns">
-        <div class="p10" style="background:#eee" ng-class="{'enable_text_select': index.network == 'testnet'}">
+        <div class="p10" style="background:white" ng-class="{'enable_text_select': index.network == 'testnet'}">
           <span ng-repeat="word in wordsC.mnemonicWords track by $index"><span style="white-space:nowrap">{{word}}</span><span ng-show="wordsC.useIdeograms">&#x3000;</span> </span>  
         </div>
         </div>

public/views/paperWallet.html

@@ -65,11 +65,12 @@
         ng-click="paperWallet.sweepWallet()" 
         translate>Sweep Wallet
       </button>
-      <div class="text-center">
-        <div class="size-12 text-gray" translate>Funds will be transfered to</div>
-        <b>{{index.alias || index.walletName}}</b>
-      </div>
     </div>
   </div>
+  <div class="text-center size-12 text-gray">
+    <span class="" translate>Funds will be transfered to</span>:
+    <b>{{index.alias || index.walletName}}</b>
+  </div>
+
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferences.html

@@ -8,11 +8,11 @@
 
 <div class="content preferences" ng-controller="preferencesController as preferences" ng-init="preferences.init()">
 
-  <ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
+  <h4></h4>
-    <h4 class="title m0">{{index.alias}} [{{index.walletName}}] <span translate>settings</span></h4>
+  <ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
 
 
-    <li class="line-b p20" ng-click="$root.go('preferencesAlias')">
+    <li  ng-click="$root.go('preferencesAlias')">
       <span translate>Wallet Alias</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
@@ -20,7 +20,7 @@
       </span>
     </li>
 
-    <li class="line-b p20" ng-click="$root.go('preferencesEmail')">
+    <li ng-click="$root.go('preferencesEmail')">
       <span translate>Email Notifications</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
@@ -29,29 +29,25 @@
       </span>
     </li>
 
-    <li class="line-b p20" ng-click="$root.go('preferencesColor')">
+    <li ng-click="$root.go('preferencesColor')">
       <span translate>Color</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
         <span ng-style="{'color':index.backgroundColor}">&block;</span>
       </span>      
     </li>
-    <li class="line-b p20" ng-hide="index.isPrivKeyExternal">
+
-      <span translate>Request Password for Spending Funds</span>
+    <li ng-show="index.isPrivKeyExternal">
-      <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
-    </li>
-    <li class="line-b p20" ng-show="preferences.touchidAvailable">
-      <span translate>Request Touch ID for Spending Funds</span>
-      <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
-    </li>
-    <li class="line-b p20" ng-show="index.isPrivKeyExternal">
       <span translate>Hardware wallet</span>
       <span class="right text-gray">
         {{preferences.externalSource}} 
         <!-- (Accont {{preferences.externalAccount}}) -->
       </span>
     </li> 
-    <li class="line-b p20" ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
+
+    <h4>
+    </h4>
+    <li ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span class="text-warning right" ng-show="index.needsBackup">
         <i class="fi-alert"></i> <span translate> Still not done</span>
@@ -59,37 +55,50 @@
       <span translate>Backup</span>
     </li>
  
-    <li class="line-b p20" ng-click="$root.go('preferencesAdvanced')">
+    <li ng-click="$root.go('preferencesAdvanced')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Advanced</span>
     </li>
   </ul>
-  <ul class="no-bullet m0 size-14">
+    <h4 translate>
+      Spending Restrictions
+    </h4>
+  <ul class="no-bullet m0 ">
+    <li  ng-hide="index.isPrivKeyExternal">
+      <span translate>Request Password</span>
+      <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
+    </li>
+    <li  ng-show="preferences.touchidAvailable">
+      <span translate>Scan Fingerpring</span>
+      <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
+    </li>
+  </ul>
+  <ul class="no-bullet m0 ">
 
-    <h4 class="title m0" translate>Global settings</h4>
+    <h4 translate>Global settings</h4>
 
-    <li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesLanguage')">
+    <li  ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesLanguage')">
       <span translate>Language</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
         {{preferences.currentLanguageName|translate}}
       </span>
     </li>
-    <li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesUnit')">
+    <li  ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesUnit')">
       <span translate>Unit</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
         {{preferences.unitName}}
       </span>
     </li>
-    <li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesAltCurrency')">
+    <li  ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesAltCurrency')">
       <span translate>Alternative Currency</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
         {{preferences.selectedAlternative.name}}
       </span>
     </li>
-    <li class="line-b p20" ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesFee')"
+    <li  ng-show="!index.noFocusedWallet" ng-click="$root.go('preferencesFee')"
       ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
       <span translate>Bitcoin Network Fee Policy</span>
       <span class="right text-gray">
@@ -97,11 +106,16 @@
         {{index.feeOpts[index.currentFeeLevel]|translate}}
       </span>
     </li> 
-    <li class="line-b p20" ng-show="!index.noFocusedWallet">
+   <li  ng-show="!index.noFocusedWallet">
       <span translate>Use Unconfirmed Funds</span>
       <switch id="spend-unconfirmed" name="spendUnconfirmed" ng-model="spendUnconfirmed" class="green right"></switch>
     </li>
-    <li class="line-b p20" ng-click="$root.go('preferencesBwsUrl')">
+
+    <li ng-show="!index.noFocusedWallet">
+      <span>Enable Glidera Service</span>
+      <switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
+    </li>
+    <li ng-click="$root.go('preferencesBwsUrl')">
       <span>Bitcore Wallet Service</span>
       <span class="text-gray db">
           <i class="icon-arrow-right3 size-24 right"></i>
@@ -109,23 +123,20 @@
         </span>
     </li>
  
-    <li class="line-b p20" ng-show="!index.noFocusedWallet">
-      <span>Enable Glidera Service</span>
-      <switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
-    </li>
     <!-- Disabled for testnet 
-    <li class="line-b p20" ng-show="!index.noFocusedWallet && glideraEnabled">
+    <li ng-show="!index.noFocusedWallet && glideraEnabled">
       <span>Glidera Sandbox</span>
       <switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
     </li>
     -->
 
-    <li class="line-b p20" ng-click="$root.go('about')">
+    <li ng-click="$root.go('about')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>About Copay</span>
     </li>
  
   </ul>
+  <h4></h4>
 
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferencesAbout.html

@@ -5,17 +5,16 @@
 </div>
 
 <div class="content preferences" ng-controller="preferencesAbout as about">
-    <h4 class="title m0" translate>Release Information</h4>
+    <h4  translate>Release Information</h4>
-
     <div  ng-controller="versionController as v">
-      <ul class="no-bullet m0 size-14">
+      <ul class="no-bullet m0">
-        <li class="line-b p20" ng-conf>
+        <li  ng-conf>
           <span translate>Version</span>
           <span class="right text-gray">
             v{{v.version}} 
           </span>      
         </li>
-        <li class="line-b p20" ng-conf ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)">
+        <li  ng-conf ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)">
           <span translate>Commit hash</span>
           <span class="right text-gray">
             #{{v.commitHash}}
@@ -24,17 +23,17 @@
       </ul>
     </div>
  
-    <h4 class="title m0">&nbsp;</h4>
+    <h4></h4>
-    <ul class="no-bullet m0 size-14">
+    <ul class="no-bullet m0">
-      <li class="line-b p20" ng-click="$root.go('disclaimer')">
+      <li  ng-click="$root.go('disclaimer')">
         <i class="icon-arrow-right3 size-24 right text-gray"></i>  
         <span translate>Terms of Use</span>
       </li>
-      <li class="line-b p20" ng-click="$root.go('translators')">
+      <li  ng-click="$root.go('translators')">
         <i class="icon-arrow-right3 size-24 right text-gray"></i>  
         <span translate>Translators</span>
       </li>
-      <li class="line-b p20" ng-conf ng-click="$root.go('logs')">
+      <li  ng-conf ng-click="$root.go('logs')">
         <i class="icon-arrow-right3 size-24 right text-gray"></i>  
         <span translate>Session log</span>
       </li>

public/views/preferencesAdvanced.html

@@ -6,28 +6,26 @@
 
 <div class="content preferences" ng-controller="preferencesAdvancedController as preferences">
 
-  <ul class="no-bullet m0 size-14">
+  <h4></h4>
+  <ul class="no-bullet m0">
 
-    <li class="line-b p20" ng-click="$root.go('information')">
+
+    <li  ng-click="$root.go('information')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Wallet Information</span>
     </li>
 
-    <li class="line-b p20" ng-click="index.retryScan(); $root.go('walletHome'); ">
+    <li ng-show="index.network == 'livenet'" class="text-capitalize" ng-click="$root.go('paperWallet')">
-      <span translate>Scan addresses for funds</span>
-    </li>
-
-    <li ng-show="index.network == 'livenet'" class="line-b p20" ng-click="$root.go('paperWallet')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Sweep paper wallet</span>
     </li>
  
-    <li class="line-b p20" ng-click="$root.go('export')">
+    <li  ng-click="$root.go('export')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <span translate>Export</span>
+      <span translate>Export Wallet</span>
     </li>
 
-    <li class="line-b p20" ng-click="$root.go('delete')">
+    <li ng-click="$root.go('delete')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Delete Wallet</span>
     </li>

public/views/preferencesAlias.html

@@ -4,13 +4,17 @@
   ng-init="titleSection='Wallet Alias'; goBackToState = 'preferences'">
 </div>
 
-<div class="content preferences p20v" ng-controller="preferencesAliasController as prefAlias">
+<div class="content preferences" ng-controller="preferencesAliasController as prefAlias">
+
+
+  <h4></h4>
   <form name="settingsAliasForm" ng-submit="prefAlias.save()" class="columns">
     <label><span translate>Alias for <i>{{index.walletName}}</i></span></label>
     <input type="text" id="alias2" type="text" name="alias2" ng-model="prefAlias.alias">
     <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}">
   </form>
-  <p class="text-gray text-center columns size-14" translate>Changing wallet alias only affects the local wallet name.</p>
+    <div class="text-gray size-12 text-center" translate>Changing wallet alias only affects the local wallet name.
+  </div>
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferencesAltCurrency.html

@@ -7,10 +7,14 @@
 
 
 <div class="content preferences" ng-controller="preferencesAltCurrencyController as prefAltCurrency">
-  <div ng-repeat="altCurrency in prefAltCurrency.alternativeOpts" ng-click="prefAltCurrency.save(altCurrency)" class="line-b p20 size-14">
+
+  <h4></h4>
+  <ul class="no-bullet m0 ">
+  <li ng-repeat="altCurrency in prefAltCurrency.alternativeOpts" ng-click="prefAltCurrency.save(altCurrency)">
     <span>{{altCurrency.name}}</span>
     <i class="fi-check size-16 right" ng-show="altCurrency.name == prefAltCurrency.selectedAlternative.name"></i>
-  </div>
+  </li>
+  <ul>
 </div>
 <div class="extra-margin-bottom"></div>
 

public/views/preferencesBwsUrl.html

@@ -6,7 +6,8 @@
 
 
 
-<div class="content preferences p20v" ng-controller="preferencesBwsUrlController as prefBwsUrl">
+<div class="content preferences" ng-controller="preferencesBwsUrlController as prefBwsUrl">
+  <h4> </h4>
   <form name="settingsBwsUrlForm" ng-submit="prefBwsUrl.save()" class="columns">
     <label>Bitcore Wallet Service URL</label>
     <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">

public/views/preferencesColor.html

@@ -7,9 +7,12 @@
 
 
 <div class="content preferences" ng-controller="preferencesColorController as p">
-  <div ng-repeat="c in p.colorOpts" ng-click="p.save(c)" class="line-b p20 size-14">
+  <h4></h4>
+  <ul class="no-bullet m0">
+  <li ng-repeat="c in p.colorOpts" ng-click="p.save(c)">
     <span ng-style="{'color': c}">&block;</span>
     <i class="fi-check size-16 right" ng-show="p.color == c"></i>
-  </div>
+  </li>
+  </ul>
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferencesDeleteWallet.html

@@ -5,8 +5,10 @@
 </div>
 
 
-<div class="content p20v" ng-controller="preferencesDeleteWalletController as preferences">
+<div class="content preferences" ng-controller="preferencesDeleteWalletController as preferences">
-  <div class="m20b text-center">
+
+  <h4></h4>
+  <div class="text-center text-gray">
     <span translate>Wallet</span>: {{index.walletName}}
     <span ng-show="index.alias">({{index.alias}})</span>
   </div>

public/views/preferencesEmail.html

@@ -6,8 +6,9 @@
 
 
 
-<div class="content preferences p20v" ng-controller="preferencesEmailController as prefEmail">
+<div class="content preferences" ng-controller="preferencesEmailController as prefEmail">
 
+  <h4></h4>
   <div class="onGoingProcess" ng-show="prefEmail.saving && !index.isOffline">
     <div class="onGoingProcess-content" ng-style="{'background-color':index.backgroundColor}">
       <div class="spinner">
@@ -34,6 +35,7 @@
     <input type="submit" class="button expand black round" value="{{'Save'|translate}}"
     ng-style="{'background-color':index.backgroundColor}" ng-disabled="emailForm.$invalid && !index.preferences.email">
   </form>
-  <p class="text-gray text-center columns size-14" translate>Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.</p>
+    <div class="text-gray size-12 text-center" translate>Setting up email notifications could weaken your privacy, if the wallet service provider is compromised. Information available to an attacker would include your wallet addresses and its balance, but no more.
+  </div>
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferencesFee.html

@@ -4,9 +4,10 @@
   ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferences'; noColor = true">
 </div>
 <div class="content preferences" ng-controller="preferencesFeeController as prefFee">
-  <ul class="no-bullet m0 size-14"> 
+  <h4></h4>
+  <ul class="no-bullet m0"> 
     <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
-      ng-click="prefFee.save(fee.level)" class="line-b p20">
+      ng-click="prefFee.save(fee.level)">
       {{index.feeOpts[fee.level]|translate}}
       <i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i>
     </li>

public/views/preferencesGlidera.html

@@ -5,28 +5,29 @@
 </div>
 
 <div class="content preferences" ng-controller="preferencesGlideraController as glidera">
+  <h4></h4>
 
-  <ul ng-if="index.glideraToken" class="no-bullet m0 size-14">
+  <ul ng-if="index.glideraToken" class="no-bullet m0">
     <h4 class="title m0">Permissions</h4>
-    <li class="line-b p20">
+    <li>
     <span>Email</span>
     <span class="right text-gray">
       {{index.glideraPermissions.view_email_address}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Personal Information</span>
     <span class="right text-gray">
       {{index.glideraPermissions.personal_info}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Buy/Sell</span>
     <span class="right text-gray">
       {{index.glideraPermissions.transact}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Transaction History</span>
     <span class="right text-gray">
       {{index.glideraPermissions.transaction_history}}
@@ -36,15 +37,15 @@
 
   <ul ng-if="index.glideraPermissions.view_email_address"
     ng-init="glidera.getEmail(index.glideraToken)"
-    class="no-bullet m0 size-14">
+    class="no-bullet m0">
     <h4 class="title m0">Email</h4>
-    <li class="line-b p20">
+    <li>
     <span>Email</span>
     <span class="right text-gray">
       {{glidera.email.email}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Active</span>
     <span class="right text-gray">
       {{glidera.email.userEmailIsSetup}}
@@ -54,76 +55,76 @@
 
   <ul ng-if="index.glideraPermissions.personal_info"
     ng-init="glidera.getPersonalInfo(index.glideraToken)"
-    class="no-bullet m0 size-14">
+    class="no-bullet m0">
     <h4 class="title m0">Personal Information</h4>
 
-    <li class="line-b p20">
+    <li>
     <span>First Name</span>
     <span class="right text-gray">
       {{glidera.personalInfo.firstName}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Middle Name</span>
     <span class="right text-gray">
       {{glidera.personalInfo.middleName}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Last Name</span>
     <span class="right text-gray">
       {{glidera.personalInfo.lastName}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Birth Date</span>
     <span class="right text-gray">
       {{glidera.personalInfo.birthDate}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Address 1</span>
     <span class="right text-gray">
       {{glidera.personalInfo.address1}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Address 2</span>
     <span class="right text-gray">
       {{glidera.personalInfo.address2}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>City</span>
     <span class="right text-gray">
       {{glidera.personalInfo.city}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>State</span>
     <span class="right text-gray">
       {{glidera.personalInfo.state}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>ZIP Code</span>
     <span class="right text-gray">
       {{glidera.personalInfo.zipCode}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Country</span>
     <span class="right text-gray">
       {{glidera.personalInfo.countryCode}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Occupation</span>
     <span class="right text-gray">
       {{glidera.personalInfo.occupation}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Basic Information State</span>
     <span class="right text-gray">
       {{glidera.personalInfo.basicInfoState}}
@@ -132,59 +133,59 @@
   </ul>
 
   <ul ng-if="index.glideraToken" ng-init="glidera.getStatus(index.glideraToken)"
-    class="no-bullet m0 size-14">
+    class="no-bullet m0">
     <h4 class="title m0">Status</h4>
 
-    <li class="line-b p20">
+    <li>
     <span>Buy/Sell</span>
     <span class="right text-gray">
       {{glidera.status.userCanTransact}}
     </span>
     </li>
 
-    <li class="line-b p20">
+    <li>
     <span>Buy</span>
     <span class="right text-gray">
       {{glidera.status.userCanBuy}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Sell</span>
     <span class="right text-gray">
       {{glidera.status.userCanSell}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Email Is Setup</span>
     <span class="right text-gray">
       {{glidera.status.userEmailIsSetup}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Phone Is Setup</span>
     <span class="right text-gray">
       {{glidera.status.userPhoneIsSetup}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Bank Account Is Setup</span>
     <span class="right text-gray">
       {{glidera.status.userBankAccountIsSetup}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Personal Information State</span>
     <span class="right text-gray">
       {{glidera.status.personalInfoState}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Bank Account State</span>
     <span class="right text-gray">
       {{glidera.status.bankAccountState}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Country</span>
     <span class="right text-gray">
       {{glidera.status.country}}
@@ -193,58 +194,58 @@
   </ul>
 
   <ul ng-if="index.glideraToken" ng-init="glidera.getLimits(index.glideraToken)"
-    class="no-bullet m0 size-14">
+    class="no-bullet m0">
     <h4 class="title m0">Limits</h4>
 
-    <li class="line-b p20">
+    <li>
     <span>Daily Buy</span>
     <span class="right text-gray">
       {{glidera.limits.dailyBuy|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Daily Sell</span>
     <span class="right text-gray">
       {{glidera.limits.dailySell|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Monthly Buy</span>
     <span class="right text-gray">
       {{glidera.limits.monthlyBuy|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Monthly Sell</span>
     <span class="right text-gray">
       {{glidera.limits.monthlySell|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Daily Buy Remaining</span>
     <span class="right text-gray">
       {{glidera.limits.dailyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Daily Sell Remaining</span>
     <span class="right text-gray">
       {{glidera.limits.dailySellRemaining|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Monthly Buy Remaining</span>
     <span class="right text-gray">
       {{glidera.limits.monthlyBuyRemaining|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Monthly Sell Remaining</span>
     <span class="right text-gray">
       {{glidera.limits.monthlySellRemaining|currency:'':2}} {{glidera.limits.currency}}
     </span>
     </li>
-    <li class="line-b p20">
+    <li>
     <span>Buy/Sell Disabled (pending first transaction)</span>
     <span class="right text-gray">
       {{glidera.limits.transactDisabledPendingFirstTransaction}}
@@ -252,10 +253,10 @@
     </li>
   </ul>
 
-  <ul class="no-bullet m0 size-14">
+  <ul class="no-bullet m0">
     <h4 class="title m0">Account</h4>
 
-    <li class="line-b p20" ng-click="glidera.revokeToken(index.glideraTestnet)">
+    <li ng-click="glidera.revokeToken(index.glideraTestnet)">
     <i class="icon-arrow-right3 size-24 right text-gray"></i>
     <span class="text-warning">Log out</span>
     </li>

public/views/preferencesInformation.html

@@ -53,7 +53,7 @@
       </li>
 
     <h4 class="title m0" translate>Extended Public Keys</h4>
-      <li class="line-b p10"  ng-repeat="pk in pubKeys">
+      <li  ng-repeat="pk in pubKeys">
         <div class="row">
           <div class="small-3 columns">Copayer {{$index}}</div>
           <div class="small-9 columns oh enable_text_select text-gray" style="text-overflow:ellipsis">
@@ -68,7 +68,7 @@
     
     <ul class="no-bullet m0 size-14" ng-show="addrs">
     <h4 class="title m0" translate>Last Wallet Addresses</h4>
-      <li class="line-b p20"  ng-repeat="a in addrs">
+      <li  ng-repeat="a in addrs" class="oh">
           <div class="enable_text_select" style="text-overflow:ellipsis">
             {{a.address}} 
           </div>
@@ -82,6 +82,14 @@
         <span translate>Only Main (not change) addresses are shown. The addresses on this list were not verified locally at this time.</span>
       </li>
 
+      <li class="line-b p20" >
+      <button class="black round small expand"  ng-style="{'background-color':index.backgroundColor}"  ng-click="index.retryScan(); $root.go('walletHome'); ">
+
+      <span translate>Scan addresses for funds</span>
+      </button>
+      </li>
+ 
+
       <li class="line-b p20" ng-hide="!index.isCordova">
       <button class="black round small expand"  ng-style="{'background-color':index.backgroundColor}" ng-click="info.sendAddrs()"><i class="fi-mail"></i>
 

public/views/preferencesLanguage.html

@@ -7,12 +7,14 @@
 
 
 <div class="content preferences" ng-controller="preferencesLanguageController as prefLang">
-  <div class="animated infinite flash text-center m20t text-gray" ng-show="prefLang.loading" translate>Applying changes</div>
+  <h4></h4>
-  <div ng-show="!prefLang.loading"
+  <ul class="no-bullet m0 ">
+  <li
     ng-repeat="lang in prefLang.availableLanguages" 
     ng-click="prefLang.save(lang.isoCode)" class="line-b p20 size-14">
     <span>{{lang.name}}</span>
     <i class="fi-check size-16 right" ng-show="index.defaultLanguageIsoCode == lang.isoCode"></i>
-  </div>
+  </li>
+  </ul>
 </div>
 <div class="extra-margin-bottom"></div>

public/views/preferencesLogs.html

@@ -6,7 +6,8 @@
 
 
 
-<div class="content p20v" ng-controller="preferencesLogs as logs">
+<div class="content preferences" ng-controller="preferencesLogs as logs">
+  <h4></h4>
 
   <div class="row columns large-centered medium-centered">
   <button class="black round small expand" ng-show="index.isCordova" ng-style="{'background-color':index.backgroundColor}" ng-click="logs.sendLogs()"><i class="fi-mail"></i>

public/views/preferencesUnit.html

@@ -8,9 +8,12 @@
 
 
 <div class="content preferences" ng-controller="preferencesUnitController as prefUnit">
-  <div ng-repeat="unit in prefUnit.unitOpts" ng-click="prefUnit.save(unit)" class="line-b p20 size-14">
+  <h4></h4>
+  <ul class="no-bullet m0 ">
+  <li ng-repeat="unit in prefUnit.unitOpts" ng-click="prefUnit.save(unit)" class="line-b p20 size-14">
     <span>{{unit.shortName}}</span>
     <i class="fi-check size-16 right" ng-show="prefUnit.unitName == unit.shortName"></i>
-  </div>
+  </li>
+  </ul>
 </div>
 <div class="extra-margin-bottom"></div>

src/css/main.css

@@ -62,6 +62,43 @@ h4.title a {
   font-size: 12px;
 }
 
+.preferences {
+  background: #f1f3f5;
+}
+
+.preferences form {
+  background: white;
+  padding-top:10px;
+  margin-bottom: 10px;
+}
+
+.preferences .switch {
+  top:-5px !important;
+}
+
+
+.preferences h4 {
+  background: #F1F3F5;
+  padding: 25px 0px 5px 20px;
+  text-transform: uppercase;
+  color: #555;
+  font-size: 12px;
+  font-weight:300;
+  margin:0;
+}
+
+
+.preferences ul {
+  font-size:14px;
+  background: white;
+}
+
+.preferences ul li {
+  padding:13px 20px;
+  border-bottom: 1px solid #E9E9EC;
+}
+
+
 body, html{
   height:100%;
   width:100%;