From 089c99b999b7cd1059611cc0a88c952fc581735e Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 17 Apr 2015 14:33:38 -0300 Subject: [PATCH 1/4] fix button txp details --- public/views/modals/txp-details.html | 4 ++-- src/css/main.css | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index 2cba794ca..619a191e3 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -108,7 +108,7 @@
@@ -116,7 +116,7 @@ diff --git a/src/css/main.css b/src/css/main.css index 6c7eb93b6..4ea1e05f7 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -597,7 +597,6 @@ button.outline:hover, button.outline:focus { border-radius: 3px; background: transparent; - text-transform: none; } .button.outline.dark-gray, From 3770d3a1acc842d685d0746222d0e5c1a44c5fe8 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 17 Apr 2015 15:21:20 -0300 Subject: [PATCH 2/4] fix send notification --- public/views/send.html | 16 ++-------------- src/css/main.css | 9 ++++----- src/css/mobile.css | 10 +++++----- src/js/controllers/send.js | 13 ++++++++++--- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/public/views/send.html b/public/views/send.html index 94e980813..8d745ac21 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -27,24 +27,12 @@
-
-
- -
- +
+ {{send.error|translate}} ×
-
-
- -
- - {{success|translate}} - - × -
diff --git a/src/css/main.css b/src/css/main.css index 4ea1e05f7..b1ff6d95f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -163,8 +163,8 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu .box-notification { position: relative; font-size: 12px; - padding: 0.7rem 3rem; - border-radius: 4px; + padding: 0.5rem 2rem 0.5rem 0.7rem; + border-radius: 2px; background: #F2F5F8; margin: 0 auto; margin-bottom: 1.6rem; @@ -198,10 +198,9 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu a.close-notification { position: absolute; - top: 0; - right: 0; + top: -4px; + right: 10px; font-size: 24px; - padding: 10px; } ul.tx-copayers { diff --git a/src/css/mobile.css b/src/css/mobile.css index ccacf8922..c0d572796 100644 --- a/src/css/mobile.css +++ b/src/css/mobile.css @@ -521,15 +521,15 @@ a.pin-button:active { } .dr-notification-content { - line-height: 100%; - padding: 7px 50px 5px 60px; + line-height: 90%; + padding: 10px 50px 5px 60px; } .dr-notification-title { color: #fff; - font-size: 14px; + font-size: 12px; margin-bottom: 0; - font-weight: 500; + font-weight: 700; } .dr-notification { @@ -545,7 +545,7 @@ a.pin-button:active { } .dr-notification-text { - font-size: 12px; + font-size: 11px; color: #fff; } diff --git a/src/js/controllers/send.js b/src/js/controllers/send.js index 283c8d40f..f61b7a716 100644 --- a/src/js/controllers/send.js +++ b/src/js/controllers/send.js @@ -5,6 +5,10 @@ angular.module('copayApp.controllers').controller('sendController', var fc = profileService.focusedClient; var self = this; + this.resetError = function() { + this.error = this.success = null; + }; + this.init = function() { this.isMobile = isMobile.any(); this.isWindowsPhoneApp = isMobile.Windows() && isCordova; @@ -12,7 +16,7 @@ angular.module('copayApp.controllers').controller('sendController', $rootScope.title = fc.credentials.m > 1 ? 'Send Proposal' : 'Send'; this.blockUx = false; - this.error = this.success = null; + this.resetError(); this.isRateAvailable = false; this.showScanner = false; @@ -106,6 +110,7 @@ angular.module('copayApp.controllers').controller('sendController', $scope.__alternative = 0; } self.alternativeAmount = $scope.__alternative; + self.resetError(); }, enumerable: true, configurable: true @@ -272,8 +277,10 @@ angular.module('copayApp.controllers').controller('sendController', } }; + + this.resetForm = function(form) { - this.error = this.success = null; + this.resetError(); this.fetchingURL = null; this._paypro = null; @@ -395,7 +402,7 @@ angular.module('copayApp.controllers').controller('sendController', }; this.onAddressChange = function(value) { - this.error = this.success = null; + this.resetError(); if (!value) return ''; if (this._paypro) From c419ff59473c2745f63c4660fed9502e4326b1f0 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 17 Apr 2015 15:27:48 -0300 Subject: [PATCH 3/4] some changes on history --- public/views/history.html | 6 +++--- public/views/modals/tx-details.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/views/history.html b/public/views/history.html index 22e6fbf2f..b59bc5b9c 100644 --- a/public/views/history.html +++ b/public/views/history.html @@ -20,10 +20,10 @@ ng-click="history.openTxModal(btx)" class="row collapse last-transactions-content">
- Received - Sent - Moved + Sent + Moved
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 9e4bc4c5a..bc5120192 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -55,11 +55,11 @@
  • Confirmations: - + Unconfirmed - + {{btx.confirmations}} From c7d530fc3337efaa1d1fd2aa52c9b61359e08994 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 17 Apr 2015 16:16:28 -0300 Subject: [PATCH 4/4] fix close reset form --- public/views/send.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/send.html b/public/views/send.html index 8d745ac21..98e2b0e48 100644 --- a/public/views/send.html +++ b/public/views/send.html @@ -31,7 +31,7 @@ {{send.error|translate}} - × + ×