64 Commits

Author	SHA1	Message	Date
Dan Finlay	57da5a8198	Merge branch 'master' into FixSvgIcons	2016-07-11 20:55:58 -07:00
Kevin Serrano	d7e6b752a3	Integrate changes back into eth-balance	2016-07-11 17:44:00 -07:00
Dan Finlay	3274bb78d7	Add coin sending tx state	2016-07-11 15:47:15 -07:00
Kevin Serrano	86b7cc6637	Resolve merge conflict.	2016-07-07 16:33:06 -07:00
Kevin Serrano	5343404d0d	Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style.	2016-07-07 16:27:37 -07:00
Kevin Serrano	570d560932	Modified test views again. Added fixed length to center tx information.	2016-07-07 15:39:19 -07:00
kumavis	ac808e681f	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 15:04:53 -07:00
Kevin Serrano	94c25ec26a	Modify development states to account for long domains.	2016-07-07 14:48:54 -07:00
Kevin Serrano	ecb0f9767b	Add new test state with tx history. Fix alignment issue with transaction history text.	2016-07-07 13:48:52 -07:00
Dan Finlay	ce463f3aff	Fixed up pending-tx-details	2016-07-06 22:48:02 -07:00
Dan Finlay	7481f7c3df	Fleshed out pending tx view	2016-07-06 21:32:36 -07:00
Dan Finlay	7058dc4ee3	Began reworking tx conf view	2016-07-06 17:58:46 -07:00
Dan Finlay	435468e571	Cleaned up some formatting for ui mocker	2016-06-30 18:42:57 -07:00
Dan Finlay	e55938ed15	First simple version of ui mocker	2016-06-30 18:22:16 -07:00