diff --git a/css/src/main.css b/css/src/main.css index f3c6fffe5..007944bf6 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -382,8 +382,8 @@ a:hover { table.last-transactions-content { padding: 0; border: 0; - background-color: #fff; - margin: 0; + background-color: #F8F8FB; + margin: 15px 0; } .last-transactions-content .box-status { @@ -532,6 +532,7 @@ a.button-setup { .p15 {padding:15px;} .p20 {padding:20px;} .p10 {padding:10px;} +.p10b {padding-bottom:10px;} .m30v {margin: 30px 0;} .m10h {margin:0 10px;} .m10v {margin:10px 0;} @@ -560,22 +561,17 @@ a.button-setup { } .line { - border-top: 1px solid #f2f2f2; - margin: 0.5rem 0 1rem; -} - -.line-sidebar { - border-top: 1px solid #34495E; + border-top: 1px solid #F8F8FB; margin: 0.7rem 0; } -.line-sidebar-t { - border-top: 1px solid #3C5269; +.line-t { + border-top: 1px solid #F8F8FB; padding-top: 0.5rem; } -.line-sidebar-b { - border-bottom: 1px solid #3C5269; +.line-b { + border-bottom: 1px solid #F8F8FB; padding-bottom: 0.5rem; } diff --git a/js/controllers/head.js b/js/controllers/head.js index 6593ee32d..3a665d01e 100644 --- a/js/controllers/head.js +++ b/js/controllers/head.js @@ -16,6 +16,20 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc controllerUtils.logout(); }; + $scope.refresh = function() { + var w = $rootScope.wallet; + if (!w) return; + + if (w.isReady()) { + w.sendWalletReady(); + if ($rootScope.addrInfos.length > 0) { + controllerUtils.clearBalanceCache(w); + controllerUtils.updateBalance(w, function() { + $rootScope.$digest(); + }); + } + } + }; // Ensures a graceful disconnect window.onbeforeunload = function() { diff --git a/views/history.html b/views/history.html index 6d48c023f..3d85e457c 100644 --- a/views/history.html +++ b/views/history.html @@ -7,9 +7,9 @@
No transactions yet.
-
-
-
+
+
+
  @@ -17,7 +17,7 @@
-
+
{{btx.amount| noFractionNumber}} {{$root.wallet.settings.unitName}} {{btx.action}}
@@ -31,11 +31,11 @@ {{btx.comment}}
-
@@ -43,7 +43,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)}} @@ -61,14 +61,10 @@
-
- Transaction ID: - - {{btx.txid}} - - +
+
+ Transaction ID: {{btx.txid}} + More details
diff --git a/views/includes/head.html b/views/includes/head.html index 18cf9b318..27c9eb3cd 100644 --- a/views/includes/head.html +++ b/views/includes/head.html @@ -17,6 +17,11 @@
+ diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index e7e58d7cf..933158b91 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -7,9 +7,6 @@
[ {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} ]
- - -
{{$root.wallet.getName()}}