Commit Graph

1143 Commits

Author SHA1 Message Date
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
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
frankiebee f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
kumavis 78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui b5251d22a6 Fix integration test failures: unnecessary sandwich-expando event stopPropagation 2017-08-04 23:34:26 -07:00
sdtsui 186bcec4fb Lint menu-droppo 2017-08-04 13:31:18 -07:00
kumavis 5f8a2ea1e6 Merge pull request #1862 from sdtsui/add-rct
Re-enable css transitions, only for dropdowns in app header
2017-08-04 13:22:25 -07:00
sdtsui 8cc3ae5988 Cleanup breakpoint css + comment on hackiness 2017-08-04 13:19:06 -07:00
sdtsui 0cd72db2d2 Adds early breakpoint from @frankiebee 's + @kumavis 's CR 2017-08-04 12:57:16 -07:00
sdtsui 4d967ebea9 Bring menu-droppo component into project, remove as a dependency 2017-08-04 11:47:36 -07:00
frankiebee 89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee fa3df576bc fixed: showing tx-s as errors vs. warning 2017-08-04 14:43:08 -04:00
sdtsui 781ac00eac Re-enable css transitions for dropdowns in header, needs menu-droppo library update 2017-08-04 11:31:07 -07:00
kumavis 29dcadc346 ui - dropdown - use Object.assign syntax to appease coverage parser 2017-08-03 21:32:08 -07:00
kumavis 5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis 17c9fd450f Merge pull request #1858 from sdtsui/NewUI
UI Tweaks, Minor Bugfixes, and Dropdown Resizing
2017-08-03 20:59:47 -07:00
sdtsui 777eb865df Adjust padding of accountSwitcher dropdown 2017-08-03 20:03:48 -07:00
sdtsui 5ddb40f60c Adjust top and bottom padding of accountSwitcher 2017-08-03 19:23:22 -07:00
sdtsui baee076348 Lint ui/app 2017-08-03 19:17:46 -07:00
sdtsui 6f14f4b717 Allow new accounts selector to handle clicks 2017-08-03 19:10:37 -07:00
sdtsui 28fd016d12 Increase size of accountSelection dropdown 2017-08-03 19:08:36 -07:00
sdtsui 36d8c3dd39 Increase size of settings dropdown and account settings dropdown 2017-08-03 18:55:11 -07:00
sdtsui 086441e41c Increase size of network dropdown 2017-08-03 18:50:29 -07:00
sdtsui 10d3a519c8 De-dupe click handler for sandwich-expando 2017-08-03 18:35:10 -07:00
frankiebee 7de58c8709 fix cancelTransaction not reciving a callback 2017-08-03 21:22:08 -04:00
sdtsui 4d6a289629 Add note with previous fa-angle-down for future refactor 2017-08-03 17:50:00 -07:00
sdtsui aff213e845 Position account switcher icon back in app header 2017-08-03 17:49:23 -07:00
sdtsui 850e9b63d2 Move accountselector menu-droppo up to app-header 2017-08-03 17:17:00 -07:00
sdtsui ecb09fcc0a Disable account selection dropdown from account details 2017-08-03 17:08:19 -07:00
sdtsui 67f10d660f Adjust account checksumAddress location up 2017-08-03 17:03:14 -07:00
Kevin Serrano 24a13d116c
Fix fox positioning. 2017-08-03 16:35:14 -07:00
Kevin Serrano 77908e1181
Fix wonky widths for notices. 2017-08-03 16:30:57 -07:00
Kevin Serrano b4f621c980
Add maximum width for private key reveal 2017-08-03 16:00:44 -07:00
Kevin Serrano ce2e9872cf
Remove 100% properties that were messing up sizing. 2017-08-03 15:51:20 -07:00
Kevin Serrano 6176a4b1bf
Add QR functionality 2017-08-03 15:32:44 -07:00
kumavis da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis da7471e095 lint fixes 2017-08-03 14:48:19 -07:00
kumavis 4115c25d8f lint fix 2017-08-01 13:21:02 -07:00
sdtsui 4044b58b5a Fix dropdown behavior - network 2017-07-28 15:55:55 -07:00
sdtsui 34834c108d Fix dropdown toggle behavior - settings 2017-07-28 15:40:26 -07:00
sdtsui 24d375aaf1 Fix dropdown toggle behavior - account dropdowns 2017-07-28 15:31:07 -07:00
Dan Finlay d1828b6dc9 Fix react warning 2017-07-27 18:43:09 -07:00
Dan Finlay a25c4f34c0 Limit max width of seed word conf screen 2017-07-27 18:32:32 -07:00
Dan Finlay 87c26eb5bc Correct token pluralization for one token 2017-07-27 18:07:42 -07:00
Dan Finlay f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay 8ba32d5ea8 Set min gas price to 1 gwei 2017-07-27 14:58:51 -07:00
Dan Finlay 9a1cf2a0d4 Ensure loading indication is full screen 2017-07-27 14:15:56 -07:00