Commit graph

140 commits

Author SHA1 Message Date
Jamal Jackson
4af098764d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-08 15:42:47 -04:00
Jamal Jackson
cb7125b15a fixed stylings on welcome and tour page for iPhone5 2016-09-08 15:42:19 -04:00
Jamal Jackson
d2b5a70d93 updated and fixed issues with collect email view styling, moved skip button to top right 2016-09-08 15:41:44 -04:00
Jason Dreyzehner
dbf2bf93e9 Merge branch 'feature/send' of github.com:nacardin/bitpay-wallet into nacardin-feature/send 2016-09-08 14:25:58 -04:00
Gustavo Maximiliano Cortez
eb92820bce Merge pull request #81 from jamal-jackson/feature/onboarding_last_steps
added height breakpoint for disclaimer view agree to terms modal to m…
2016-09-08 15:13:25 -03:00
Gustavo Maximiliano Cortez
112d30d3e6 Merge pull request #78 from jamal-jackson/feature/recieve_bitcoin_views
Initial setup of receive tab(waiting on some designs/views to be made)
2016-09-08 15:13:15 -03:00
Nick Cardin
7e29b9eb98 send view first pass 2016-09-08 11:36:08 -04:00
Jamal Jackson
57c1942740 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-08 10:33:21 -04:00
Jamal Jackson
b99bfd1cbd polished responsiveness of welcome view 2016-09-08 10:17:34 -04:00
Jamal Jackson
dfe0c39260 added height breakpoint for disclaimer view agree to terms modal to make relative, fixed alignment on tour view 2016-09-07 15:05:30 -04:00
Gustavo Maximiliano Cortez
0adc79b85e Merge pull request #74 from cmgustavo/ref/design-23
Fix modals tx, txp and search
2016-09-07 15:07:20 -03:00
Gustavo Maximiliano Cortez
f3e837a3a8 Merge pull request #65 from cmgustavo/ref/design-20
Fix bitpay card. Replaces the app-name in desktop
2016-09-07 15:06:55 -03:00
Gustavo Maximiliano Cortez
28a896c18f Merge pull request #72 from cmgustavo/ref/design-22
Fix button to skip onboarding-email
2016-09-07 15:01:38 -03:00
Jamal Jackson
b0c5fc22db added help circle and tip modal 2016-09-07 13:49:08 -04:00
Gustavo Maximiliano Cortez
040b2e6627
Fix modals tx, txp and search 2016-09-07 13:34:47 -03:00
Jamal Jackson
364fd32ca6 fixed check in circle position on disclaimer page 2016-09-07 10:33:58 -04:00
Jamal Jackson
a2c509092d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 2016-09-07 10:33:23 -04:00
Jamal Jackson
ad862bc78c added arrow top to wallets background 2016-09-07 09:56:52 -04:00
Gustavo Maximiliano Cortez
42a8eaa119
Fix button to skip onboarding-email 2016-09-07 10:49:47 -03:00
Jamal Jackson
23b67a4afc fixed issue with absolute position on safari browser 2016-09-07 09:47:47 -04:00
Jamal Jackson
21a2f41ef9 began update for wallet module and receive screen 2016-09-07 09:46:00 -04:00
Nick Cardin
6b19189caa update nav link css 2016-09-06 17:58:04 -04:00
Gustavo Maximiliano Cortez
6f7ab548be Merge pull request #62 from jamal-jackson/feature/onboarding_last_steps
Onboarding disclaimer steps
2016-09-06 15:18:54 -03:00
Gustavo Maximiliano Cortez
5e03f803de
Fix bitpay card. Replaces the app-name in desktop 2016-09-06 15:14:07 -03:00
Gustavo Maximiliano Cortez
241213ca4f
Fix glidera issues (tx proposals and ui) 2016-09-06 11:59:05 -03:00
Jamal Jackson
229e2fd8ec Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps
# Conflicts:
#	public/views/onboarding/terms.html
#	src/sass/views/onboarding/terms-of-use.scss
2016-09-06 10:46:47 -04:00
Jamal Jackson
0ad4e390bb finished terms of use page 2016-09-06 10:43:54 -04:00
Jamal Jackson
a78724bcca setup disclaimer view and styles 2016-09-06 10:06:13 -04:00
Matias Alejo Garcia
22c06c73a3 Merge pull request #53 from cmgustavo/ref/design-15
Ref/design 15
2016-09-02 17:01:44 -03:00
Gustavo Maximiliano Cortez
c1bb2cd2a5
Fix css 2016-09-02 16:54:44 -03:00
Gustavo Maximiliano Cortez
e19d5dc254
onboarding email: fix scrolling when focus input 2016-09-02 15:55:43 -03:00
Gustavo Maximiliano Cortez
2fccd89c3a
Fix onboarding params, buttons, states 2016-09-02 15:42:45 -03:00
Matias Alejo Garcia
8c43f55756
add notpending in proposals 2016-09-02 14:33:18 -03:00
Gustavo Maximiliano Cortez
f8fddd2431
Fix topbar for mobile 2016-09-02 13:00:38 -03:00
Jamal Jackson
cc72e06f43 updated arrow icon, removed border in header 2016-09-02 07:17:18 -04:00
Jamal Jackson
ee7bb0f455 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_wallet_created
# Conflicts:
#	public/views/onboarding/backupWarning.html
#	src/sass/common.scss
2016-09-02 06:57:50 -04:00
Jamal Jackson
c4d159ca1f success and backup views and styles 2016-09-02 06:50:23 -04:00
Gustavo Maximiliano Cortez
d856ef99b8 Merge pull request #35 from gabrielbazan7/feat/QrOnboarding
Qr - remove main tabs from import view (onboarding)
2016-09-01 17:50:31 -03:00
Nick Cardin
70db673855 update walletDetails header styles 2016-09-01 15:25:03 -04:00
Gabriel Bazán
7835694fb2 import with Qr in onboarding 2016-09-01 16:04:58 -03:00
Nick Cardin
3a771e0e21 Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/topBarColor 2016-09-01 11:40:43 -04:00
Jamal Jackson
a6a0742c90 set up initial success screen and added animation for collecting email form 2016-09-01 11:24:52 -04:00
Jamal Jackson
38282f181e added collect email styling, updated create default wallet action on tour.html 2016-09-01 09:25:57 -04:00
Jamal Jackson
8485b62df1 fixed header style issue on tour 2016-09-01 09:02:28 -04:00
Jamal Jackson
f15d597b25 pulled in latest commits from yesterday, merged and handled conflicts 2016-09-01 08:59:37 -04:00
Jamal Jackson
e3634f63d1 finished on boarding tour ui improvements, started on wallet create 2016-09-01 08:51:48 -04:00
Nick Cardin
8d762b380b standardize buttons and bar color 2016-08-31 18:02:15 -04:00
Nick Cardin
bacf1fb68f update add wallet view 2016-08-31 17:11:05 -04:00
Matias Alejo Garcia
15a288e194 Merge pull request #21 from cmgustavo/ref/design-08
popupServices: BitPay Card and Glidera
2016-08-31 17:11:05 -03:00
Nick Cardin
62a1a1a87a use ionic scss instead of css, set ionic vars 2016-08-31 15:54:40 -04:00