From 8005e4677019de0b21f7949999e61bd5084704de Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 12:34:58 -0300 Subject: [PATCH 1/4] fix history item ui --- public/img/icon-moved.svg | 22 ++++++++++++++++++++ public/img/icon-receive.svg | 22 ++++++++++++++++++++ public/img/icon-sent.svg | 22 ++++++++++++++++++++ public/views/walletHome.html | 40 +++++++++++++++++++++--------------- src/css/main.css | 2 +- 5 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 public/img/icon-moved.svg create mode 100644 public/img/icon-receive.svg create mode 100644 public/img/icon-sent.svg diff --git a/public/img/icon-moved.svg b/public/img/icon-moved.svg new file mode 100644 index 000000000..96b2b78e7 --- /dev/null +++ b/public/img/icon-moved.svg @@ -0,0 +1,22 @@ + + + + Oval 145 Copy 7 + retweet + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-receive.svg b/public/img/icon-receive.svg new file mode 100644 index 000000000..caa28e347 --- /dev/null +++ b/public/img/icon-receive.svg @@ -0,0 +1,22 @@ + + + + Oval 145 Copy 5 + downloadbox + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-sent.svg b/public/img/icon-sent.svg new file mode 100644 index 000000000..cfb0426e5 --- /dev/null +++ b/public/img/icon-sent.svg @@ -0,0 +1,22 @@ + + + + Oval 145 Copy 7 + send copy + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 295234259..b19d04430 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -216,15 +216,29 @@
-
- Received - Sent - Moved - Invalid +
+
+ sync + sync + sync +
+
+ Received + + {{index.addressbook[btx.addressTo]}} + + {{btx.message}} + + + Sent + + + Moved + Invalid +
-
+
+ - @@ -235,9 +249,7 @@ {{btx.amountStr}} -
-
-
+
@@ -245,15 +257,9 @@
-
+
-
-
{{btx.message}}
-
- To: {{index.addressbook[btx.addressTo] || btx.addressTo}} -
-
diff --git a/src/css/main.css b/src/css/main.css index e0cd00855..b91d4365c 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -330,7 +330,7 @@ ul.tx-copayers { .last-transactions-content { background: #fff; - padding: 1.5rem 1rem; + padding: 0.8rem 1rem; cursor:pointer; border-bottom: 1px solid #E4E8EC; } From 0ed427070abd2425269b6aa14a5f5317819e2862 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:07:38 -0300 Subject: [PATCH 2/4] ui tx proposal pending --- public/img/icon-proposal.svg | 20 ++++++++++ public/views/includes/transaction.html | 55 +++++++++++++------------- src/css/main.css | 8 +++- 3 files changed, 54 insertions(+), 29 deletions(-) create mode 100644 public/img/icon-proposal.svg diff --git a/public/img/icon-proposal.svg b/public/img/icon-proposal.svg new file mode 100644 index 000000000..63e90d1b8 --- /dev/null +++ b/public/img/icon-proposal.svg @@ -0,0 +1,20 @@ + + + + Oval 145 Copy 5 + send + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 24093e465..4b3fa3fcb 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -1,37 +1,36 @@
-
- -   -
-
-
- Send {{tx.amountStr}} - -
-
- - Recipients: - {{tx.recipientCount}} +
+
+ + sync +
+
+ + {{index.addressbook[tx.toAddress]}} + + {{tx.message}} - - To: - - {{tx.merchant.domain}} - {{tx.merchant.domain}} - - - {{index.addressbook[tx.toAddress] || tx.toAddress}} - + + Sending -
-
- {{tx.message}} -
+ + + {{tx.merchant.domain}} + {{tx.merchant.domain}} + +
-
-
+
+ + - {{tx.amountStr}} + +
+ +
+
+
diff --git a/src/css/main.css b/src/css/main.css index b91d4365c..8c6d02f7f 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -342,6 +342,12 @@ ul.tx-copayers { text-align: center; } +.icon-circle-active { + position: absolute; + bottom: 2px; + right: 2px; +} + .icon-sign { padding: 0.2rem 0.3rem; border-radius: 100%; @@ -1422,7 +1428,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus { } .spinner > div { - background-color: #fff; + background-color: #8597A7; height: 100%; width: 2px; display: inline-block; From 5768fffc128c812997e3ff06fb863c35c1d3e1de Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:08:44 -0300 Subject: [PATCH 3/4] fix transactions downloading notification --- public/views/walletHome.html | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index b19d04430..c7cd7de3c 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -176,26 +176,18 @@
+ + No transactions yet +

Could not fetch transaction history

 - - No transactions yet -
-
-
- sync -
-
- Initial transaction history synchronization can take some minutes for wallets with many transactions. - Please stand by. -
-
+
-
- {{index.txProgress}}
- Transactions Downloaded +
+ {{index.txProgress}} + Transactions Downloaded
+ Wait some minutes...
From 5ed135b68966a377306a4a3c8ce5520b9889fb2c Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 3 Dec 2015 15:48:03 -0300 Subject: [PATCH 4/4] fix spinner home --- src/css/main.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/css/main.css b/src/css/main.css index 8c6d02f7f..a2f714b74 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1427,8 +1427,12 @@ input.ng-invalid-match, input.ng-invalid-match:focus { vertical-align: middle; } -.spinner > div { +.walletHome .spinner > div { background-color: #8597A7; +} + +.spinner > div { + background-color: #fff; height: 100%; width: 2px; display: inline-block;