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 @@

{{noti.title|translate}}

-
{{noti.content|translate}}
+
{{noti.content|translate}} +
+
{{noti.content|translate}} +
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 @@ -
+

Password cannot be recovered. Be sure to write it down {{pass.error|translate}} -

+

diff --git a/src/css/main.css b/src/css/main.css index 498f77a27..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 { @@ -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; diff --git a/src/css/mobile.css b/src/css/mobile.css index 01de79460..aaf0f0948 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; @@ -269,7 +268,7 @@ a.missing-copayers { } .label { - font-size: 80%; + font-size: 70%; padding: 0.2rem 0.2rem; } @@ -523,12 +522,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; } 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':