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
..
mixins	updated and fixed issues with collect email view styling, moved skip button to top right	2016-09-08 15:41:44 -04:00
views	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications	2016-09-14 11:42:33 -04:00
common.scss	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps	2016-09-08 15:42:47 -04:00
forms.scss	added basic modal class styling, styled success modal	2016-09-13 14:05:49 -04:00
ionic.scss	setup disclaimer view and styles	2016-09-06 10:06:13 -04:00
main.scss	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_push_notifications	2016-09-14 11:42:33 -04:00