From 633b603f253261fe18deb5ff59f86cffd4fd62bf Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 16 Apr 2015 10:16:29 -0300
Subject: [PATCH 1/5] fix password modal

---
 public/views/includes/password.html | 4 ++--
 src/css/main.css                    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index d9b966399..8656abe51 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -35,10 +35,10 @@
     </div>
   </div>
 
-    <div class="text-warning size-12 columns m20t" ng-show="index.askPassword.isSetup">
+    <p class="text-warning size-12 columns m20t text-center" ng-show="index.askPassword.isSetup">
       <i class="fi-alert"></i>
       <span translate ng-show="!pass.error"> Password cannot be recovered. Be sure to write it down</span>
 
       <span ng-show="pass.error">{{pass.error|translate}}</span>
-    </div>
+    </p>
  </div>
diff --git a/src/css/main.css b/src/css/main.css
index 498f77a27..dce52046b 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1105,7 +1105,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   border-radius: 5px;
   position: absolute;
   width: 90%;
-  height: 40%;
   left: 5%;
   top: 15%;
   z-index: 1100;

From c8f5846b5d3b380dad22dba0e43bbc1d439eab37 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 16 Apr 2015 10:20:25 -0300
Subject: [PATCH 2/5] change warning color

---
 src/css/main.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/css/main.css b/src/css/main.css
index dce52046b..6c7eb93b6 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -70,7 +70,7 @@ body, html{
 
 
 .color-alert {
-  color: #C0392A;
+  color: #ED4A43;
 }
 
 .alt-currency.green {
@@ -189,7 +189,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
 }
 
 .box-notification .box-icon.error {
-  background-color: #C0392A;
+  background-color: #ED4A43;
 }
 
 .box-notification .box-icon.secondary {
@@ -464,7 +464,7 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .label.success {background-color: #1ABC9C;}
-.label.alert {background-color: #C0392A;}
+.label.alert {background-color: #ED4A43;}
 .label.gray {background-color: #4B6178;}
 
 .history .label  {
@@ -474,7 +474,7 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .bg-alert {
-  background-color: #C0392A;
+  background-color: #ED4A43;
 }
 
 .ellipsis {
@@ -659,7 +659,7 @@ button.warning:hover,
 button.warning:focus, 
 .button.warning:hover, 
 .button.warning:focus { 
-  background-color: #C0392A;
+  background-color: #ED4A43;
   color: #fff;
   border-radius: 3px;
 }
@@ -786,7 +786,7 @@ label.postfix, a.postfix {
 }
 
 .need-backup {
-  background: #C0392A;
+  background: #ED4A43;
   -moz-box-shadow:    1px 1px 0px 0px #A02F23;
   box-shadow:         1px 1px 0px 0px #A02F23;
   position: absolute;
@@ -840,12 +840,12 @@ label.postfix, a.postfix {
 
 .icon-input .fi-x {
   padding: .1rem .3rem;
-  background-color: #C0392A;
+  background-color: #ED4A43;
   border-radius: 100%;
 }
 
 .has-error {
-  color: #C0392A;
+  color: #ED4A43;
 }
 
 .is-valid {

From 583e0cc15ab272bd0ea86b347e3b57b27c2114c9 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 16 Apr 2015 11:24:16 -0300
Subject: [PATCH 3/5] fix notification size

---
 src/css/mobile.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/css/mobile.css b/src/css/mobile.css
index 01de79460..ae5e79214 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -523,12 +523,12 @@ a.pin-button:active {
 
 .dr-notification-content {
   line-height: 100%;
-  padding: 4px 50px 5px 60px;
+  padding: 7px 50px 5px 60px;
 }
 
 .dr-notification-title {
   color: #fff;
-  font-size: 15px;
+  font-size: 14px;
   margin-bottom: 0;
   font-weight: 500;
 }

From d9a4967c71e1dee08c35b462dfe655672583fd02 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 16 Apr 2015 11:54:22 -0300
Subject: [PATCH 4/5] change color wallet default

---
 src/css/mobile.css                      | 1 -
 src/js/controllers/index.js             | 2 +-
 src/js/controllers/preferencesColor.js  | 2 +-
 src/js/controllers/sidebar.js           | 2 +-
 src/js/services/notificationsService.js | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/css/mobile.css b/src/css/mobile.css
index ae5e79214..e9369ee85 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -149,7 +149,6 @@ _:-ms-fullscreen, :root .main {
 }
 
 .amount {
-  background-color:  #1ABC9C;
   width: 100%;
   text-align: center;
   padding: 3rem 1rem;
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 70b781d3d..dd9fd6a71 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -264,7 +264,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
   self.updateColor = function() {
     var config = configService.getSync();
     config.colorFor = config.colorFor || {};
-    self.backgroundColor = config.colorFor[self.walletId] || '#1ABC9C';
+    self.backgroundColor = config.colorFor[self.walletId] || '#2C3E50';
     var fc = profileService.focusedClient;
     fc.backgroundColor = self.backgroundColor;
   };
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index 7d9b58853..cea2165d4 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -19,7 +19,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
 
     var config = configService.getSync();
     config.colorFor = config.colorFor || {};
-    this.color = config.colorFor[walletId] || '#1ABC9C';
+    this.color = config.colorFor[walletId] || '#2C3E50';
 
     this.save = function(color) {
       var self = this;
diff --git a/src/js/controllers/sidebar.js b/src/js/controllers/sidebar.js
index 824711411..ba5350b69 100644
--- a/src/js/controllers/sidebar.js
+++ b/src/js/controllers/sidebar.js
@@ -41,7 +41,7 @@ angular.module('copayApp.controllers').controller('sidebarController',
           n: c.n,
           name: c.walletName,
           id: c.walletId,
-          color: config.colorFor[c.walletId] || '#1ABC9C',
+          color: config.colorFor[c.walletId] || '#2C3E50',
         };
       });
       self.wallets = lodash.sortBy(ret, 'walletName');
diff --git a/src/js/services/notificationsService.js b/src/js/services/notificationsService.js
index 1851f8d18..4434c2239 100644
--- a/src/js/services/notificationsService.js
+++ b/src/js/services/notificationsService.js
@@ -52,7 +52,7 @@ angular.module('copayApp.services')
 
       var config = configService.getSync();
       config.colorFor = config.colorFor || {};
-      var color = config.colorFor[walletId] || '#1ABC9C';
+      var color = config.colorFor[walletId] || '#2C3E50';
 
       switch (notificationData.type) {
         case 'NewTxProposal':

From 652ab3c222ef0a5a737f9140d1c51959b00bca24 Mon Sep 17 00:00:00 2001
From: bechi <bechilandia@gmail.com>
Date: Thu, 16 Apr 2015 12:22:43 -0300
Subject: [PATCH 5/5] fix delete notification

---
 public/views/includes/notifications.html | 8 ++++++--
 src/css/mobile.css                       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/views/includes/notifications.html b/public/views/includes/notifications.html
index 7fecf026e..943d9dec7 100644
--- a/public/views/includes/notifications.html
+++ b/public/views/includes/notifications.html
@@ -6,8 +6,12 @@
     </div>
     <div class="dr-notification-content">
       <h3 class="dr-notification-title">{{noti.title|translate}}</h3>
-      <div class="dr-notification-text label" 
-        ng-style="{'background-color':noti.userData.color}">{{noti.content|translate}}</div>
+      <div class="dr-notification-text label radius" ng-show="noti.userData.color" 
+        ng-style="{'background-color':noti.userData.color}">{{noti.content|translate}}
+      </div>
+      <div class="dr-notification-text" ng-show="!noti.userData.color" 
+        >{{noti.content|translate}}
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index e9369ee85..aaf0f0948 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -268,7 +268,7 @@ a.missing-copayers {
 } 
 
 .label {
-  font-size: 80%;
+  font-size: 70%;
   padding: 0.2rem 0.2rem;
 }