Commit graph

159 commits

Author SHA1 Message Date
Jamal Jackson
fdb5e467b9 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications
# Conflicts:
#	public/views/onboarding/notifications.html
#	src/js/controllers/onboarding/collectEmail.js
2016-09-14 11:42:33 -04:00
Jamal Jackson
df30370e67 removed cat margin bottom at certain height 2016-09-14 11:40:04 -04:00
Gabriel Bazán
f007fb305d import new scss 2016-09-14 10:26:38 -03:00
Gabriel Bazán
c21d447031 avatar in send view 2016-09-14 10:05:02 -03:00
Gustavo Maximiliano Cortez
d6601637f9
Adds gravatar 2016-09-13 17:39:01 -03:00
Jamal Jackson
4a1ea6d3ea updating on boarding button classes on tour page 2016-09-13 15:55:08 -04:00
Jamal Jackson
390a7deecf finish adding styles for push notifications view(initial testing for iPhone5 size devices only) 2016-09-13 15:45:56 -04:00
Jamal Jackson
ee046cde4e increased modal backdrop opacity with what found in zeplin 2016-09-13 14:35:27 -04:00
Jamal Jackson
d39f69531d Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_backup_phrase
# Conflicts:
#	public/views/includes/confirmBackupPopup.html
#	src/js/controllers/backup.js
2016-09-13 14:26:25 -04:00
Jamal Jackson
13c56798fe updated language and position on confirm on backup file 2016-09-13 14:15:51 -04:00
Jamal Jackson
8b24adb53c added basic modal class styling, styled success modal 2016-09-13 14:05:49 -04:00
Gabriel Bazán
d28c837fcf onboarding process details 2016-09-12 15:12:22 -03:00
Jamal Jackson
294b4200f4 reduced spring between words in phrase 2016-09-12 12:39:29 -04:00
Jamal Jackson
576cf04138 completed second step in backup 2016-09-12 12:25:15 -04:00
Jamal Jackson
984c713a6d finish initial backup phrase view where phrase is shown to user 2016-09-12 10:14:06 -04:00
Jamal Jackson
ae1cdf4d03 added global max-width to on boarding view 2016-09-09 14:01:39 -04:00
Jamal Jackson
91a216cf0d onboarding backup desktop stylings updates 2016-09-09 13:47:27 -04:00
Jamal Jackson
3af5405340 cleaned up backup warning view on iPhone5 2016-09-09 10:05:35 -04:00
Jamal Jackson
be927da487 fixed backup request view for iPhone5 size devices 2016-09-09 09:47:53 -04:00
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