From 4f899dd0801d3b4160997574f0a6219d62ddab6c Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Sat, 11 Apr 2015 17:12:44 -0300
Subject: [PATCH] Fix style colors for wp8

---
 public/views/backup.html                 | 13 +++++++++----
 public/views/history.html                |  3 ++-
 public/views/importLegacy.html           |  2 +-
 public/views/includes/menu.html          |  2 +-
 public/views/includes/notifications.html |  3 ++-
 public/views/includes/password.html      |  3 ++-
 public/views/includes/sidebar.html       |  3 ++-
 public/views/includes/topbar.html        |  2 +-
 public/views/modals/paypro.html          |  2 +-
 public/views/modals/tx-details.html      |  2 +-
 public/views/modals/txp-details.html     |  5 +++--
 public/views/preferences.html            |  2 +-
 public/views/preferencesBwsUrl.html      |  2 +-
 public/views/preferencesColor.html       |  2 +-
 public/views/receive.html                |  5 +++--
 public/views/send.html                   |  3 ++-
 public/views/walletHome.html             |  5 +++--
 src/css/mobile.css                       |  2 +-
 18 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/public/views/backup.html b/public/views/backup.html
index a0d185ddc..c5039c509 100644
--- a/public/views/backup.html
+++ b/public/views/backup.html
@@ -22,18 +22,23 @@
       name="password" ng-model="backup.repeatpassword">
     </div>
 
-    <button class="black radius expand" ng-click="backup.downloadWalletBackup()" ng-disabled="backup.loading || (!backup.password || backup.password != backup.repeatpassword)"    style="background-color:{{index.backgroundColor}}" 
+    <button class="black radius expand" ng-click="backup.downloadWalletBackup()" 
+      ng-disabled="backup.loading || (!backup.password || backup.password != backup.repeatpassword)" 
+      ng-style="{'background-color':index.backgroundColor}" 
       ng-show="!backup.isSafari && !backup.isCordova"><i class="fi-download"></i>
       <span translate>Download backup</span></button>
-    <button class="black radius expand" ng-click="backup.viewWalletBackup()" ng-disabled="backup.loading"    style="background-color:{{index.backgroundColor}}" 
+    <button class="black radius expand" ng-click="backup.viewWalletBackup()" ng-disabled="backup.loading"
+      ng-style="{'background-color':index.backgroundColor}" 
       ng-show="backup.isSafari && !backup.isCordova"><i class="fi-eye"></i>
       <span translate>View backup</span></button>
     <div ng-show="backup.isCordova">
       <h4 translate>Backup options</h4>
-      <button class="black radius expand"  ng-disabled="backup.loading ||  (!backup.password || backup.password != backup.repeatpassword)"    style="background-color:{{index.backgroundColor}}" 
+      <button class="black radius expand"  ng-disabled="backup.loading ||  (!backup.password || backup.password != backup.repeatpassword)" 
+        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 radius expand"  ng-disabled="backup.loading ||   (!backup.password || backup.password != backup.repeatpassword)"   style="background-color:{{index.backgroundColor}}" 
+      <button class="black radius expand"  ng-disabled="backup.loading ||   (!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>
     </div>
diff --git a/public/views/history.html b/public/views/history.html
index cf1c54ffc..f49075310 100644
--- a/public/views/history.html
+++ b/public/views/history.html
@@ -12,7 +12,8 @@
       ng-click="history.openTxModal(btx)" 
       class="row last-transactions-content">
       <div class="large-3 medium-3 small-3 columns">
-        <span class="label tu" ng-show="btx.action == 'received'"  style="background-color:{{index.backgroundColor}}">Received</span>
+        <span class="label tu" ng-show="btx.action == 'received'" 
+          ng-style="{'background-color':index.backgroundColor}">Received</span>
         <span class="label tu gray" ng-show="btx.action == 'sent'">Sent</span>
         <span class="label tu gray" ng-show="btx.action == 'moved'">Moved</span>
       </div>
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html
index 9faeae7fa..fce892877 100644
--- a/public/views/importLegacy.html
+++ b/public/views/importLegacy.html
@@ -10,7 +10,7 @@
           <h1 class="m20b animated infinite flash"> Importing...</h1>
           <ul>
             <li ng-repeat="m in importLegacy.messages"> 
-              <span  style="opacity: {{m.opacity}}"> {{m.message}} </span>
+            <span ng-style="{'opacity':m.opacity}"> {{m.message}} </span>
           </ul>
         </div>
 
diff --git a/public/views/includes/menu.html b/public/views/includes/menu.html
index 41ea7f54b..299858f88 100644
--- a/public/views/includes/menu.html
+++ b/public/views/includes/menu.html
@@ -4,7 +4,7 @@
   ng-controller="menuController as menu">
     <div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in menu.menu">
       <a ng-click="menu.go(item.link)" ng-class="{'active': activeMenu == item.link}" 
-        style="border-top-color:{{activeMenu==item.link ? index.backgroundColor : ''}}"> 
+        ng-style="{'border-top-color':activeMenu==item.link ? index.backgroundColor : ''}"> 
         <i class="size-36 {{item.icon}} db"></i> 
         <div class="size-10 tu">
           {{item.title|translate}} 
diff --git a/public/views/includes/notifications.html b/public/views/includes/notifications.html
index f63a21954..7fecf026e 100644
--- a/public/views/includes/notifications.html
+++ b/public/views/includes/notifications.html
@@ -6,7 +6,8 @@
     </div>
     <div class="dr-notification-content">
       <h3 class="dr-notification-title">{{noti.title|translate}}</h3>
-      <div class="dr-notification-text label" style="background-color:{{noti.userData.color}}">{{noti.content|translate}}</div>
+      <div class="dr-notification-text label" 
+        ng-style="{'background-color':noti.userData.color}">{{noti.content|translate}}</div>
     </div>
   </div>
 </div>
diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index b961d3145..d9b966399 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -27,7 +27,8 @@
     </div>
       
     <div class="small-6 columns">
-      <button class="radius expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"   style="background-color:{{index.backgroundColor}}" >
+      <button class="radius expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password" 
+        ng-style="{'background-color':index.backgroundColor}">
         <span translate ng-if="index.askPassword.isSetup" translate>SET</span>
         <span translate ng-if="!index.askPassword.isSetup" translate>ENTER</span>
       </button>
diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html
index 2b70a9593..d2628f6ac 100644
--- a/public/views/includes/sidebar.html
+++ b/public/views/includes/sidebar.html
@@ -9,7 +9,8 @@
     ng-class="{'selected': item.id == index.walletId}"
     class="nav-item">
     <a ng-click="sidebar.switchWallet(item.id)">
-      <div class="avatar-wallet" style="background-color:{{item.color}}">{{(item.name || item.id) | limitTo: 1}}</div>
+      <div class="avatar-wallet" 
+        ng-style="{'background-color':item.color}">{{(item.name || item.id) | limitTo: 1}}</div>
       <div class="ellipsis name-wallet">{{item.name || item.id}}</div>
       <div class="size-12">{{item.m}} of {{item.n}}</div> 
     </a>
diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 5ff4ad4c3..6e8c408fb 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -15,7 +15,7 @@
   </section>
 
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis"  style="color:{{index.backgroundColor}}">
+    <h1 class="title ellipsis" ng-style="{'color':index.backgroundColor}">
       {{(titleSection|translate) || index.walletName}}
     </h1>
   </section>
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html
index 2c2216ff1..61641b8e0 100644
--- a/public/views/modals/paypro.html
+++ b/public/views/modals/paypro.html
@@ -5,7 +5,7 @@
     </a>
   </section>
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis" style="color:{{color}}" translate>
+    <h1 class="title ellipsis" ng-style="{'color':color}" translate>
       Payment protocol request
     </h1>
   </section>
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 226748ca6..9e4bc4c5a 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -5,7 +5,7 @@
     </a>
   </section>
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis"   style="color:{{color}}" translate>
+    <h1 class="title ellipsis" ng-style="{'color':color}" translate>
       Transaction
     </h1>
   </section>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 6912ca667..6864eb19f 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -5,7 +5,7 @@
     </a>
   </section>
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis"   style="color:{{color}}" translate>
+    <h1 class="title ellipsis" ng-style="{'color':color}" translate>
       Transaction proposal
     </h1>
   </section>
@@ -113,7 +113,8 @@
       </button>
     </div>
     <div class="large-5 medium-5 small-6 columns text-right">
-      <button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)"  style="background-color:{{color}}"  
+      <button class="button primary m0 expand" ng-click="hideTxInfo = true; sign(tx)" 
+        ng-style="{'background-color':color}"  
         ng-disabled="loading">
         <i class="fi-check icon-sign check"></i>  
         <span translate>Sign</span>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index 1f51b9c81..bfcb9397c 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -6,7 +6,7 @@
       <span translate>Color</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
-        <span  style="color:{{index.backgroundColor || '#1ABC9C'}}">&block;</span>
+        <span ng-style="{'color':index.backgroundColor || '#1ABC9C'}">&block;</span>
       </span>      
     </li>
     <li class="line-b p20">
diff --git a/public/views/preferencesBwsUrl.html b/public/views/preferencesBwsUrl.html
index 27725d166..0242e6461 100644
--- a/public/views/preferencesBwsUrl.html
+++ b/public/views/preferencesBwsUrl.html
@@ -3,7 +3,7 @@
     <label translate>Bitcore Wallet Service URL</label>
     <input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="prefBwsUrl.bwsurl">
     <input type="submit" class="button expand black radius" value="{{'Save'|translate}}" 
-    style="background-color:{{index.backgroundColor}}">
+    ng-style="{'background-color':index.backgroundColor}">
   </form>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/preferencesColor.html b/public/views/preferencesColor.html
index 78e5c1923..3cca9b01b 100644
--- a/public/views/preferencesColor.html
+++ b/public/views/preferencesColor.html
@@ -1,6 +1,6 @@
 <div class="preferences" ng-controller="preferencesColorController as p">
   <div ng-repeat="c in p.colorOpts" ng-click="p.save(c)" class="line-b p20 size-14">
-    <span  style="color:{{c}}">&block;</span>
+    <span ng-style="{'color': c}">&block;</span>
     <i class="fi-check size-16 right" ng-show="p.color == c"></i>
   </div>
 </div>
diff --git a/public/views/receive.html b/public/views/receive.html
index 6732d3832..eb967c30d 100644
--- a/public/views/receive.html
+++ b/public/views/receive.html
@@ -19,7 +19,7 @@
   </div>
   <div class="small-6 columns m20t">
   <span class="button black expand radius tiny" 
-    ng-click="$root.go('backup')"    style="background-color:{{index.backgroundColor}}" >
+    ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" >
     <span translate>Backup now</span>
   </span>
 </div>
@@ -58,7 +58,8 @@
     </div>
     <div class="row m20t" ng-show="receive.addr && !index.isOffLine && !index.clientError">
           <div class="large-12 columns">
-            <a class="button black expand radius" ng-click="receive.newAddress()"    style="background-color:{{index.backgroundColor}}" translate>
+            <a class="button black expand radius" ng-click="receive.newAddress()" 
+              ng-style="{'background-color':index.backgroundColor}" translate>
               Generate new address
             </a>
           </div>
diff --git a/public/views/send.html b/public/views/send.html
index cbe48949f..95e3e6d95 100644
--- a/public/views/send.html
+++ b/public/views/send.html
@@ -146,7 +146,8 @@
 
           <div class="row" ng-show="!send.onGoingProcess">
             <div class="large-6 medium-6 small-12 columns">
-              <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx"    style="background-color:{{index.backgroundColor}}"  translate>
+              <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || send.blockUx" 
+                ng-style="{'background-color':index.backgroundColor}"  translate>
                 Send
               </button>
             </div>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index dcdd67389..f86194a4f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -1,6 +1,6 @@
 <div class="home-wallet" ng-controller="walletHomeController as home" ng-init="home.init()">
   <div class="row" ng-show="!index.noFocusedWallet">
-        <div class="amount" style="background-color:{{index.backgroundColor}}">
+    <div class="amount" ng-style="{'background-color':index.backgroundColor}">
           <div class="size-36">
             <strong>
               <span ng-show="!index.hideBalance">
@@ -18,7 +18,8 @@
           </div>
         </div>
         <div class="pr columns line-b">
-          <div class="avatar-wallet left"  style="background-color:{{index.backgroundColor}}">{{index.walletName | limitTo: 1}}</div>      
+          <div class="avatar-wallet left" 
+            ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}</div>      
           <div class="right">
             <a ng-click="$root.go('preferences')" class="button outline light-gray tiny m0">
               <i class="fi-widget size-18 vm"></i>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 7010ab210..007e5e747 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -129,7 +129,7 @@ _:-ms-fullscreen, :root .main {
 }
 
 .tab-bar .text-close {
-  margin-right: 5px;
+  margin-right: 10px;
   font-size: 1rem;
   font-weight: 400;
 }