3823 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
sdtsui	9004081ae0	Ignore all compiled css, track only scss	2017-08-06 13:46:49 -07:00
sdtsui	2eddfec342	Remove output folder	2017-08-06 13:46:11 -07:00
sdtsui	aeaf917cbb	Clean up gulpfile	2017-08-06 13:44:50 -07:00
sdtsui	bd9549bddc	Use 4.x pattern for watching scss	2017-08-06 13:43:25 -07:00
sdtsui	600f3bfdc9	Ignore itcss sourcemaps	2017-08-06 13:27:07 -07:00
sdtsui	38f53066f3	Remove unncessary sourcemaps from css output/	2017-08-06 13:26:00 -07:00
sdtsui	d46a79df25	Organize app components scss	2017-08-06 13:24:13 -07:00
sdtsui	b65dc85b0a	Organize app components	2017-08-06 13:06:18 -07:00
sdtsui	a0a956d646	Move generic button components and body styles to components and generic, respectively	2017-08-06 13:02:31 -07:00
sdtsui	04d1d86f30	Move old colors intro settings/variables	2017-08-06 12:49:02 -07:00
sdtsui	f0a219294d	Add inverted triangle css (itcss) folder structure	2017-08-06 12:45:21 -07:00
sdtsui	bc73cbdbfe	Cleanup css and gulpfile post-migration	2017-08-06 12:29:26 -07:00
sdtsui	3f222854e4	Migrate from css to scss + autoprefixer	2017-08-06 12:09:17 -07:00
sdtsui	50fc9c9658	Improve readability of changelog	2017-08-06 10:02:37 -07:00
kumavis	a456baea8b	Merge branch 'master' into NewUI	2017-08-05 00:29:10 -07:00
kumavis	3f5b82f7ef	Merge pull request #1867 from sdtsui/NewUI ... Fix integration tests for NewUI	2017-08-05 00:27:29 -07:00
sdtsui	f37f405d52	Fix integration test failures: ensure qr code is accessible	2017-08-04 23:34:54 -07:00
sdtsui	b5251d22a6	Fix integration test failures: unnecessary sandwich-expando event stopPropagation	2017-08-04 23:34:26 -07:00
Frankie	2ba5737728	Merge pull request #1866 from MetaMask/v3.9.5 ... V3.9.5	2017-08-04 17:26:19 -04:00
kumavis	c82908e843	v3.9.5	2017-08-04 14:16:19 -07:00