+ class="row collapse last-transactions-content">
Received
@@ -27,7 +27,7 @@
-
+
+
-
{{btx.amountStr}}
diff --git a/public/views/send.html b/public/views/send.html
index a56af8618..94e980813 100644
--- a/public/views/send.html
+++ b/public/views/send.html
@@ -137,15 +137,16 @@
diff --git a/src/css/main.css b/src/css/main.css
index d04a4b59e..498f77a27 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -468,8 +468,9 @@ input[type=number]::-webkit-outer-spin-button {
.label.gray {background-color: #4B6178;}
.history .label {
- width: 69px;
+ width: 57px;
text-align: center;
+ font-size: 65%;
}
.bg-alert {
@@ -639,14 +640,6 @@ button.secondary:focus,
border-radius: 3px;
}
-button.disabled.secondary,
-button[disabled].secondary,
-.button.disabled.secondary,
-.button[disabled].secondary {
- background-color: #E4E8EC;
- color: #A5B2BF;
-}
-
/* PRIMARY */
button.primary,
button.primary:hover,
@@ -659,14 +652,6 @@ button.primary:focus,
border-radius: 3px;
}
-button.disabled.primary,
-button[disabled].primary,
-.button.disabled.primary,
-.button[disabled].primary {
- background-color: #95a5a6;
- color: #E6E6E6;
-}
-
/* WARNING */
button.warning,
.button.warning,
@@ -679,14 +664,6 @@ button.warning:focus,
border-radius: 3px;
}
-button.disabled.warning,
-button[disabled].warning,
-.button.disabled.warning,
-.button[disabled].warning {
- background-color: #95a5a6;
- color: #E6E6E6;
-}
-
/* WHITE */
button.white,
.button.white {
@@ -694,14 +671,6 @@ button.white,
color: #2C3E50;
}
-button.disabled.white,
-button[disabled].white,
-.button.disabled.white,
-.button[disabled].white {
- background-color: #95a5a6;
- color: #E6E6E6;
-}
-
/* BLACK */
button.black,
.button.black {
@@ -709,14 +678,6 @@ button.black,
color: #fff;
}
-button.disabled.black,
-button[disabled].black,
-.button.disabled.black,
-.button[disabled].black {
- background-color: #95a5a6;
- color: #E6E6E6;
-}
-
/* GRAY */
button.gray,
.button.gray {
@@ -724,6 +685,31 @@ button.gray,
color: #2C3E50;
}
+button.disabled.black,
+button[disabled].black,
+.button.disabled.black,
+.button[disabled].black,
+button.disabled.white,
+button[disabled].white,
+.button.disabled.white,
+.button[disabled].white,
+button.disabled.warning,
+button[disabled].warning,
+.button.disabled.warning,
+.button[disabled].warning,
+button.disabled.primary,
+button[disabled].primary,
+.button.disabled.primary,
+.button[disabled].primary,
+button.disabled.secondary,
+button[disabled].secondary,
+.button.disabled.secondary,
+.button[disabled].secondary {
+ background-color: #A5B2BF !important;
+ color: #fff;
+}
+
+
.button, button {
text-transform: uppercase;
}
@@ -881,7 +867,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-primary {color: #1ABC9C;}
.text-secondary {color: #3498DB;}
.text-white {color: #fff;}
-.text-warning {color: #CA5649;}
+.text-warning {color: #ED4A43;}
.text-success {color: #1ABC9C;}
.panel {
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 1e0e4e506..01de79460 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -1,3 +1,4 @@
+
/*
*
* Copay mobile CSS
@@ -616,7 +617,7 @@ a.pin-button:active {
.popup-txrejected i {
font-size: 5rem;
- background-color: #CA5649;
+ background-color: #ED4A43;
color: #fff;
border-radius: 100%;
width: 150px;
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index d37529b47..7d9b58853 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -4,12 +4,14 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
function($scope, configService, profileService, go) {
var config = configService.getSync();
this.colorOpts = [
- '#1ABC9C',
+ '#F38F12',
+ '#F4D03F',
'#4A90E2',
- '#F39C12',
- '#FF3366',
+ '#484ED3',
'#9B59B6',
- '#213140',
+ '#E856EF',
+ '#F883B4',
+ '#2C3E50',
];
var fc = profileService.focusedClient;