From ba781bcbf714de86970e30fc44c5b43f2379f730 Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Tue, 30 Aug 2016 19:00:17 -0400 Subject: [PATCH 1/2] update tab-home first pass --- public/img/icon-backup.svg | 28 +++++ public/img/icon-bitcoin.svg | 24 +++++ public/img/icon-bitpay.svg | 14 +++ public/img/icon-gift.svg | 30 ++++++ public/img/icon-wallet.svg | 47 +++++---- public/views/buyandsell.html | 3 - public/views/includes/walletActivity.html | 77 +++++++------- public/views/tab-home.html | 108 ++++++++++++-------- src/sass/main.scss | 4 + src/sass/views/common.scss | 27 +++++ src/sass/views/includes/walletActivity.scss | 27 +++++ src/sass/views/tab-home.scss | 22 ++++ 12 files changed, 305 insertions(+), 106 deletions(-) create mode 100755 public/img/icon-backup.svg create mode 100755 public/img/icon-bitcoin.svg create mode 100644 public/img/icon-bitpay.svg create mode 100755 public/img/icon-gift.svg create mode 100644 src/sass/views/common.scss create mode 100644 src/sass/views/includes/walletActivity.scss create mode 100644 src/sass/views/tab-home.scss diff --git a/public/img/icon-backup.svg b/public/img/icon-backup.svg new file mode 100755 index 000000000..37e44d19c --- /dev/null +++ b/public/img/icon-backup.svg @@ -0,0 +1,28 @@ + + + + item-ico-backup + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-bitcoin.svg b/public/img/icon-bitcoin.svg new file mode 100755 index 000000000..42747c028 --- /dev/null +++ b/public/img/icon-bitcoin.svg @@ -0,0 +1,24 @@ + + + + item-ico-bitcoin + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-bitpay.svg b/public/img/icon-bitpay.svg new file mode 100644 index 000000000..80ec34117 --- /dev/null +++ b/public/img/icon-bitpay.svg @@ -0,0 +1,14 @@ + + + + b_2_ + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-gift.svg b/public/img/icon-gift.svg new file mode 100755 index 000000000..fbb6344cd --- /dev/null +++ b/public/img/icon-gift.svg @@ -0,0 +1,30 @@ + + + + item-ico-gift + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-wallet.svg b/public/img/icon-wallet.svg index b8b642c96..9cbcfb85f 100644 --- a/public/img/icon-wallet.svg +++ b/public/img/icon-wallet.svg @@ -1,21 +1,28 @@ - - - - -Wallet-Copy -Created with Sketch. - - - - - - - + + + + Wallet Copy + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/views/buyandsell.html b/public/views/buyandsell.html index 3649604be..a516f5b69 100644 --- a/public/views/buyandsell.html +++ b/public/views/buyandsell.html @@ -12,9 +12,6 @@ - - TODO - diff --git a/public/views/includes/walletActivity.html b/public/views/includes/walletActivity.html index 7e50b47d2..76931d556 100644 --- a/public/views/includes/walletActivity.html +++ b/public/views/includes/walletActivity.html @@ -1,41 +1,42 @@ + + +
+ Payment Received +
+ {{x.amountStr}} +
+
- - - {{x.amountStr}} +
+ + Proposal Deleted +
+ +
+ + Proposal Rejected +
+ +
+ + + + {{x.amountStr}} + {{x.message}} + + + + Proposal Accepted + +
+ + +

+ + {{ x.creatorName}}@ + {{x.wallet.name}} + +

+ - - - - - Proposal Deleted - - - - - Proposal Rejected - - - - - - - {{x.amountStr}} - {{x.message}} - - - - Proposal Accepted - - - - -
- - - - · - - {{ x.creatorName}}@{{x.wallet.name}} -
- diff --git a/public/views/tab-home.html b/public/views/tab-home.html index d74cebb31..4f45e54cc 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -1,13 +1,12 @@ - - + Home -
-
+
+
Recent Activity
@@ -15,80 +14,99 @@
Updating activity. Please stand by
-
-
+
+
Wallets - +
-
- No Wallet -
- - - {{item.name || item.id}} - - {{item.m}}-of-{{item.n}} + + + + +

{{wallet.name || wallet.id}}

+ + {{wallet.m}}-of-{{wallet.n}} - + Incomplete - - {{item.status.availableBalanceStr}} - - +

+ {{wallet.status.availableBalanceStr}} +

+

[Balance Hidden] - +

+ - BitPay Card + +

BitPay Card

 - Gift Cards + +

Gift Cards
-
-
+
+
Buy & Sell Bitcoin
- - + + + - + +
-
-
+
+
Next steps
- - Add BitPay Card + + + + + Crate a bitcoin wallet + - - Buy and Sell Bitcoin + + + + + Buy Bitcoin + - - Buy a Gift Cards + + + + + Add BitPay Card + + + + + + + Add Amazon Gift Card +
diff --git a/src/sass/main.scss b/src/sass/main.scss index a60e952fe..0ece1c388 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -996,3 +996,7 @@ input[type=number] { white-space: initial; } } + +@import "views/common"; +@import "views/tab-home"; +@import "views/includes/walletActivity"; diff --git a/src/sass/views/common.scss b/src/sass/views/common.scss new file mode 100644 index 000000000..53cb79b97 --- /dev/null +++ b/src/sass/views/common.scss @@ -0,0 +1,27 @@ +.icon.nav-item-arrow-right { + color: #666; + font-size: 26px; +} + +.item.item-heading { + font-weight: bold; +} + +.icon.list-add-button { + color: #666; + font-size: 38px; +} + +.item.item-big-icon-left { + padding-left: 74px; +} + +.icon.big-icon-svg { + padding: 0 7px; + > img { + border-radius: 50%; + width: 40px; + height: 40px; + box-shadow: 0px 6px 12px 0px rgba(0, 0, 0, 0.3); + } +} diff --git a/src/sass/views/includes/walletActivity.scss b/src/sass/views/includes/walletActivity.scss new file mode 100644 index 000000000..d5f723582 --- /dev/null +++ b/src/sass/views/includes/walletActivity.scss @@ -0,0 +1,27 @@ +.wallet-activity { + + &-amount { + float: right; + font-size: 18px; + } + + &-note { + margin-top: 3px; + font-size: 12px!important; + + &-child { + line-height: 30px; + vertical-align: middle; + } + + > i { + font-size: 21px; + margin-right: 8px; + } + + > time { + float: right; + } + } + +} diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss new file mode 100644 index 000000000..f9e38aae3 --- /dev/null +++ b/src/sass/views/tab-home.scss @@ -0,0 +1,22 @@ +#tab-home { + .icon-create-wallet { + background-image: url("../img/icon-bitcoin.svg"); + background-repeat:no-repeat; + background-position: -5px -5px; + } + .icon-buy-bitcoin { + background-image: url("../img/icon-gift.svg"); + background-repeat: no-repeat; + background-position: -5px -6px; + } + .icon-bitpay-card { + background-image: url("../img/icon-bitpay.svg"); + background-repeat: no-repeat; + background-position: -5px -6px; + } + .icon-gift { + background-image: url("../img/icon-gift.svg"); + background-repeat: no-repeat; + background-position: -5px -6px; + } +} From 966d00d2d895549f088fbcaf8f05fcf9e1633d45 Mon Sep 17 00:00:00 2001 From: Nick Cardin Date: Wed, 31 Aug 2016 14:42:39 -0400 Subject: [PATCH 2/2] update bitpay card icon --- public/img/icon-bitpay.svg | 9 +++++---- public/views/tab-home.html | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/img/icon-bitpay.svg b/public/img/icon-bitpay.svg index 80ec34117..5105aa1fe 100644 --- a/public/img/icon-bitpay.svg +++ b/public/img/icon-bitpay.svg @@ -1,13 +1,14 @@ - + - b_2_ + Oval 87 + bitpay-logo-grayscale Created with Sketch. - + - + + diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 4f45e54cc..0c258b9e6 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -96,7 +96,7 @@ - + Add BitPay Card