3843 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sdtsui	928adae104	Implement modal content for buy flow - mobile view	2017-08-08 17:11:25 -07:00
Thomas Huang	0e6bc6647e	Merge pull request #1854 from MetaMask/greenkeeper/initial ... Greenkeeper/initial	2017-08-08 16:32:55 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
kumavis	cd1437fdd3	Merge pull request #1861 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 2	2017-08-08 15:54:08 -07:00
frankiebee	88b84e3895	add json-rpc-engine && eth-json-rpc-middleware to devDependencies	2017-08-08 18:34:59 -04:00
frankiebee	a13643bdb5	fix class names	2017-08-08 18:30:49 -04:00
frankiebee	e761fb0ef7	use provider stub	2017-08-08 18:30:22 -04:00
frankiebee	be4011c310	create a provider stub	2017-08-08 18:30:03 -04:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00
Thomas Huang	67e4855b9d	Updated commonjs require path for redux-logger and redux-thunk modules	2017-08-08 14:15:45 -07:00
sdtsui	922a272e81	Add note for responsive modal styles	2017-08-08 14:05:19 -07:00
sdtsui	29c8f448ca	Hook up global modal to Tx view, Buy button	2017-08-08 13:37:52 -07:00
sdtsui	f72f57dc6c	Implement global modal	2017-08-08 13:37:41 -07:00
sdtsui	aab0fda9ac	Add actions and reducers for global modal	2017-08-08 13:37:16 -07:00
sdtsui	da51f56df9	Add dependencies and JSX support (reactify), for global modal implementation	2017-08-08 13:36:54 -07:00
Simon Liang	0db627d979	refactored and added unit test	2017-08-08 20:15:30 +08:00
Simon Liang	e8ade42f2a	extracted balance component and renders to the format, also wired in the account name	2017-08-08 16:49:45 +08:00
frankiebee	3a2190ec3c	fix the bind on pending tx watchers	2017-08-07 16:58:38 -04:00
frankiebee	28fbdca830	remove .only	2017-08-07 16:41:54 -04:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
frankiebee	e7f838e626	fix test	2017-08-07 14:56:17 -04:00
frankiebee	59124eb6fd	remove logging of the message and log the error	2017-08-07 14:45:43 -04:00
frankiebee	a54c26382e	remove unnecessary if statment for error message	2017-08-07 14:40:07 -04:00
frankiebee	fb9866b4e1	fix spelling	2017-08-07 14:37:20 -04:00
kumavis	b8ab1170f8	Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:24 -07:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
kumavis	57abc58d62	Merge pull request #1835 from MetaMask/NewUI ... Begin UI Refactor with Responsiveness & New Menus	2017-08-07 10:51:18 -07:00
sdtsui	d8fff0fc8c	Opt for calculated values in absolutely positioned caret	2017-08-06 23:12:40 -07:00
sdtsui	0f140c5db5	Improve positioning of caret and add reusable color for wallet view	2017-08-06 22:30:27 -07:00
sdtsui	ba50411bb2	Position account icon, name, and caret	2017-08-06 21:54:42 -07:00
sdtsui	29662ff7b4	Move tx and wallet view styles to component classes	2017-08-06 20:47:59 -07:00
sdtsui	5c7adc911d	Merge branch 'NewUI' into feat/mm-ui-5-merged	2017-08-06 20:24:04 -07:00
sdtsui	02c2106c3b	Merge branch 'master' into feat/mm-ui-5	2017-08-06 19:55:34 -07:00
sdtsui	fd36d95c50	Cleanup before rebase on NewUI - need new version of AccountDropdowns	2017-08-06 19:52:13 -07:00
sdtsui	b3d7abd5d4	Allow clicks on account view to enable sidebar, not just burger	2017-08-06 19:29:51 -07:00
sdtsui	850d2124c8	Refactor account name css - mobile views	2017-08-06 19:26:52 -07:00
sdtsui	7cb031eeb9	Add sidebar click handler to overlay	2017-08-06 19:03:38 -07:00
sdtsui	a7017b824d	Refactor app-header css, including box shadow and z-index	2017-08-06 18:50:23 -07:00
sdtsui	403d9c52b5	Add fine css tweaks to hero balance - laptop	2017-08-06 18:14:48 -07:00
sdtsui	f06a18a09c	Adjust hero balance on mobile	2017-08-06 17:46:18 -07:00
sdtsui	ebf39831c4	Adjust size of buttons for 576-780+px range	2017-08-06 17:13:31 -07:00
sdtsui	dc0f78c1b9	Fix font size of eth display for 576-780px vw	2017-08-06 16:58:45 -07:00
sdtsui	c1b8517959	Normalize sidebar dimensions and adjust hero button responsiveness	2017-08-06 16:37:41 -07:00
sdtsui	802c29c986	Implement hero balance UI, mobile	2017-08-06 15:46:55 -07:00
sdtsui	17de77f24a	Position account display and burger in mobile tx view	2017-08-06 14:56:13 -07:00
sdtsui	c9b33da184	Disable debug styles	2017-08-06 14:25:34 -07:00
sdtsui	966b25573b	Move remaining debug, fonts, reset, and transitions into inverted triangle	2017-08-06 14:03:44 -07:00
sdtsui	f73e4dd604	Move debug and colors to itcss	2017-08-06 13:53:22 -07:00