diff --git a/css/src/main.css b/css/src/main.css index 9014665cd..08dcc6312 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -352,17 +352,9 @@ a:hover { overflow: hidden; } -.last-transactions-content { - overflow: hidden; - padding: 1rem; - background: #CED3DB; -} - table.last-transactions-content { - padding: 0; - border: 0; background-color: #F8F8FB; - margin: 10px 0; + margin-bottom: 10px; } .last-transactions-content .box-status { @@ -542,6 +534,11 @@ a.button-setup { margin: 0.7rem 0; } +.line-white { + border-top: 1px solid #fff; + margin: 0.7rem 0; +} + .line-t { border-top: 1px solid #F8F8FB; padding-top: 0.5rem; @@ -836,22 +833,42 @@ label small.has-error { font-size: 11px; } -table { border-collapse: collapse; text-align: left; width: 100%; border: none; +table { + border-collapse: collapse; text-align: left; width: 100%; border: none; box-shadow: -2px 1px 9px 1px #DDDDDD; --webkit-box-shadow: -2px 1px 5px 1px #DDDDDD; --moz-box-shadow: -2px 1px 5px 1px #DDDDDD; --o-box-shadow: -2px 1px 5px 1px #DDDDDD; - + -webkit-box-shadow: -2px 1px 5px 1px #DDDDDD; + -moz-box-shadow: -2px 1px 5px 1px #DDDDDD; + -o-box-shadow: -2px 1px 5px 1px #DDDDDD; } -thead tr{ text-transform: uppercase; border-top: 1px solid #FFFFFF; height: 46px} -table td, table th { padding: 15px 15px; height: 58px} } -table thead th {background-color: #F5F5F8; color:#949BAD; font-size: 13px; font-weight: normal; !important} -table tbody td { color: #000000; font-size: 14px;border-bottom: 1px solid #F1F1F3; } -table tbody tr:last-child td { border-bottom: none; } +thead tr{ + text-transform: uppercase; + border-top: 1px solid #FFFFFF; + height: 46px +} -table tr.active { - background: #CBECE6; +table tr td, table tr th { + padding: 15px; +} + +table.last-transactions-content tr td, +table.last-transactions-content tr th { + padding: 5px; +} + +table tfoot tr td, table tfoot tr th, table thead tr td, table thead tr th { + background-color: #F5F5F8; + color:#949BAD; + font-weight: normal +} + +table tbody td { + color: #666; + border-bottom: 1px solid #F1F1F3; +} + +table tbody tr:last-child td { + border-bottom: none; } table tr.deleting { @@ -1247,6 +1264,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { .text-secondary {color: #3498DB;} .text-white {color: #fff;} .text-warning {color: #CA5649;} +.text-success {color: #1ABC9C;} a.text-gray:hover {color: #2C3E50;} a.text-black:hover {color: #213140;} diff --git a/css/src/mobile.css b/css/src/mobile.css index 792672616..e8143b0b4 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -123,14 +123,6 @@ padding: 0 5px; } - table.last-transactions-content td { - text-align: center; - } - - table.last-transactions-content td.copayer-name { - text-align: left; - } - table.last-transactions-content .icon-status { border-radius: 0; padding: 0.1rem 0.3rem; diff --git a/js/controllers/paymentIntent.js b/js/controllers/paymentIntent.js index 846111383..93a40f5ce 100644 --- a/js/controllers/paymentIntent.js +++ b/js/controllers/paymentIntent.js @@ -5,6 +5,8 @@ var bitcore = require('bitcore'); angular.module('copayApp.controllers').controller('PaymentIntentController', function($rootScope, $scope, $modal, $location, controllerUtils) { $scope.wallets = []; + $rootScope.title = 'Payment intent'; + $rootScope.starting = true; var wids = _.pluck($rootScope.iden.listWallets(), 'id'); _.each(wids, function(wid) { @@ -12,6 +14,7 @@ angular.module('copayApp.controllers').controller('PaymentIntentController', fun if (w && w.isReady()) { $scope.wallets.push(w); + $rootScope.starting = false; controllerUtils.clearBalanceCache(w); controllerUtils.updateBalance(w, function() { $rootScope.$digest(); diff --git a/js/models/Wallet.js b/js/models/Wallet.js index b205515b9..a7cbffef0 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -2693,7 +2693,7 @@ Wallet.prototype.verifyAddressbookEntry = function(rcvEntry, senderId, key) { Wallet.prototype.toggleAddressBookEntry = function(key) { if (!key) throw new Error('Key is required'); this.addressBook[key].hidden = !this.addressBook[key].hidden; - this.emitAndKeepAlive('addressBookUpdated'); + this.emitAndKeepAlive('addressBookUpdated', true); }; /** diff --git a/views/history.html b/views/history.html index cc1e1d957..24b34e71f 100644 --- a/views/history.html +++ b/views/history.html @@ -70,7 +70,7 @@ -
+
@@ -99,17 +99,20 @@ -
- - Generating file... +
+
+
+ + Generating file... +
+
+ + + Download CSV file + +
-
- - - Download - -
- +
diff --git a/views/includes/transaction.html b/views/includes/transaction.html index 73e72ecf8..7a8878c90 100644 --- a/views/includes/transaction.html +++ b/views/includes/transaction.html @@ -24,7 +24,7 @@
- + + +
{{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} + {{c.cId === $root.wallet.getMyCopayerId() ? 'Me' : $root.wallet.publicKeyRing.nicknameForCopayer(c.cId)}} diff --git a/views/profile.html b/views/profile.html index d398d1de0..0fb7db5a4 100644 --- a/views/profile.html +++ b/views/profile.html @@ -42,51 +42,49 @@

Manage wallets

- - - + - + + data-ng-repeat="item in wallets | orderBy:'name'" + ng-init="isReady = item.isReady(); + networkName = item.getNetworkName()" + ng-class="{'deleting':loading==item.id}"> - + - - - -
Name TypeStatusStatus BalanceActionsActions
{{item.name || item.id }} {{item.requiredCopayers}} of {{item.totalCopayers}} - {{networkName}}{{isReady ? 'Complete' : 'Waiting for copayers...'}} + {{isReady ? 'Complete' : 'Waiting for copayers...'}} + - {{item.balanceInfo.totalBalance || 0 |noFractionNumber}} {{item.settings.unitName}} - +
+ ng-show="!isSafari"> -     + ng-show="isSafari"> +   + ng-really-click="deleteWallet(item)" + ng-show="loading != item.id">
- -
- + +
diff --git a/views/send.html b/views/send.html index 697108974..9f94fea42 100644 --- a/views/send.html +++ b/views/send.html @@ -194,7 +194,7 @@ Address Creator Date -   + Enable @@ -205,8 +205,12 @@ {{addr}} {{$root.wallet.publicKeyRing.nicknameForCopayer(info.copayerId)}} - {{info.hidden ? - 'Enable' : 'Disable'}} + + + + +