1738 Commits

Author	SHA1	Message	Date
Chi Kei Chan	e20ec3b389	Token menu ellipsis alignment	2017-10-10 14:43:06 -07:00
Chi Kei Chan	b7e2bcf806	Reduce header shadow on mobile	2017-10-10 14:40:00 -07:00
Chi Kei Chan	d4343fe7e5	Fix recipient on send token	2017-10-10 14:36:13 -07:00
Chi Kei Chan	c221f5ce79	Confirm Token and Confirm Contract v2	2017-10-10 14:30:20 -07:00
Chi Kei Chan	119c2b2423	Confirm eth v2	2017-10-10 14:16:57 -07:00
Dan	71d6463984	Refactor 'rendersingleidentity' to a stand alone account-list-item component.	2017-10-09 18:24:14 -07:00
Dan	80463072b5	UI for readonly from component. From dropdown opening and closing. Mockdata.	2017-10-09 18:24:14 -07:00
Dan Finlay	f18615a82a	Merge pull request #2296 from MetaMask/precision-fix ... Fix precision to account for small wei increase.	2017-10-09 14:15:09 -07:00
Dan	db1258f3de	Conversion util can invert conversion rate	2017-10-08 17:49:52 -07:00
Dan	49f76d27a9	Adds checkFeatureToggle util.	2017-10-08 17:48:09 -07:00
Dan	bbe893a0d8	UI for send screen container without form rows.	2017-10-08 17:48:09 -07:00
Dan	49aa6e73ea	Edit account modal shows and allows editing of name from props, not just placeholder.	2017-10-08 17:45:59 -07:00
Dan	c9c940bfc1	Clear selected token when changing network.	2017-10-08 17:45:34 -07:00
Sergey Ukustov	53bb4bebb1	More appropriate styling	2017-10-07 23:25:40 +03:00
Kevin Serrano	e6a618b82d	Fix precision to account for small wei increase.	2017-10-05 15:26:03 -07:00
Dan Finlay	c5b7880f05	Merge branch 'master' into SignTypedData	2017-10-05 11:55:23 -07:00
Dan	583342bd56	Removes old/second setProviderType method from before merge (commit bd99bc2e)	2017-10-04 15:43:10 -07:00
Kevin Serrano	27c72ee565	Revert to normal balances.	2017-10-04 12:10:01 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
Dan	ac4868170f	Enables remove token and ensures add/remove update the list without need for refresh.	2017-10-03 15:46:01 -07:00
Kevin Serrano	1893c50730	Merge pull request #2175 from MetaMask/RemoveSlackLink ... Remove slack link	2017-10-03 10:46:29 -07:00
Kevin Serrano	44949813de	Merge pull request #2251 from BrandenSoropia/remove-metamask-title ... Removed MetaMask title. Fixed #1730.	2017-10-03 10:15:33 -07:00
Dan	45dbd017e6	Add needed iterator in tx-list and path to account in selectors.	2017-10-02 18:09:45 -07:00
Dan	d206f183f5	Hide token confirmation modal ui	2017-10-02 18:09:09 -07:00
Sergey Ukustov	e11ca12890	Merge remote-tracking branch 'upstream/master'	2017-10-03 02:10:47 +03:00
kumavis	2113d83489	ui - tx history - simplify error+warning display code	2017-10-02 15:39:44 -07:00
Kevin Serrano	4b0e6a0a77	Merge branch 'master' into RemoveSlackLink	2017-10-02 15:23:27 -07:00
Branden Soropia	db1dd46f8d	Removed MetaMasktitle. Fixed #1730.	2017-10-02 00:02:30 -04:00
Dan	47ebcbb2ed	Token menu ui.	2017-10-01 19:02:21 -07:00
Dan	ff64fe98dd	Shapeshift deposit tx modal.	2017-10-01 18:58:57 -07:00
Dan	7c4d8c4562	Enables the old shapeshift UI within new ui.	2017-10-01 18:58:57 -07:00
kumavis	a2b6d3ffc5	network - remove long dead etherscan provider code	2017-09-29 16:37:01 -07:00
kumavis	d6ea2fa425	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
Sergey Ukustov	82d1f39198	Respect code style	2017-09-29 19:53:03 +03:00
Sergey Ukustov	c2b8dada91	Add eth_signTypedData handler	2017-09-29 19:40:46 +03:00
Chi Kei Chan	67ee5b21e6	Query for gas estimates	2017-09-28 17:39:53 -07:00
Chi Kei Chan	4f106854ba	Hide ShapeShift and Fix Modal Stylings	2017-09-28 16:34:42 -07:00
Chi Kei Chan	06292107d7	Always set currency to USD on app mount	2017-09-28 16:13:53 -07:00
Dan	66ed4dfaa3	Ensure sent token value is recognized as hex.	2017-09-28 15:55:18 -07:00
Dan	a195427e72	Fix send of USD and backspacing amount to 0	2017-09-28 15:54:51 -07:00
Dan	b55a40c7f1	Close sidebar on token selection.	2017-09-28 15:54:04 -07:00
Dan	a4838b1c57	Close mobile sidebar when selecting 'Add token' from account options dropdown.	2017-09-28 15:54:04 -07:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
Dan	deee689426	Use font-awesome icons for create and import account.	2017-09-27 18:08:49 -07:00
Dan	c2ccd6e90e	Makes styling fixes to account dropdown.	2017-09-27 18:08:49 -07:00
Dan	10345a12c2	Keep privateKey out of state and clear it after closing export private key modal.	2017-09-27 18:06:26 -07:00
Dan	01816e1b22	Adds a back button to export private key modal; connects account details to same modal.	2017-09-27 18:06:26 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
tmashuang	734490c58c	Add AUD, HKD, SGD, IDR, PHP to currency conversion list	2017-09-27 11:16:38 -07:00
Chi Kei Chan	c77029ea90	Implement Confirm Deploy Contract screen	2017-09-26 19:21:04 -07:00
Dan	39365f2cc4	Update the correct values in state when estimates are received.	2017-09-26 18:43:26 -07:00
Dan	541b69dda9	Gets gas and price estimates when send components mount.	2017-09-26 18:43:26 -07:00
Dan	25c2865076	Restore notification functionality	2017-09-26 18:42:39 -07:00
Kevin Serrano	e998d528f0	Merge branch 'master' into RemoveSlackLink	2017-09-26 15:47:31 -07:00
Kevin Serrano	accee14282	Remove old conversion list.	2017-09-26 10:35:13 -07:00
Kevin Serrano	7b199e215d	Polish names on currency list.	2017-09-26 10:11:18 -07:00
Kevin Serrano	88ddedfb5a	Account for undefined currencies.	2017-09-26 10:09:50 -07:00
Dan Finlay	57b5f15265	Remove slack link	2017-09-26 10:01:16 -07:00
Chi Kei Chan	bdd1e58e55	Return null if transaction.key is shapeshift	2017-09-26 09:15:14 -07:00
Dan	7102772c3a	Connect export key modal to state and enable actions.	2017-09-26 09:05:29 -07:00
Chi Kei Chan	0d4433ed58	Merge branch 'NewUI-flat' into MM-57-use-gas-estimator	2017-09-25 19:55:56 -07:00
Dan	5f6ec6aa98	Remove unnecessary trailing comma.	2017-09-25 18:30:56 -07:00
Dan	56697ea9a4	Select all in to and from of send screens, instead of clearing on focus.	2017-09-25 18:30:56 -07:00
Dan	eae40e0544	Able to change selections in to and from fields of send and send token.	2017-09-25 18:30:56 -07:00
Dan	2c474b0d6e	Export private key modal body ui.	2017-09-25 18:29:43 -07:00
Dan	fc3e071ad6	Send token now estimates gas and price.	2017-09-25 22:09:10 -02:30
Dan	79bcb88db3	Refactor to store estimated gas and price in local state, return promise from actions.	2017-09-25 21:54:55 -02:30
Dan	88c4226bf1	Estimate gasPrice and gasLimit in send screen.	2017-09-25 21:54:55 -02:30
Dan	a1d87b821b	Update send token to handle errors onBlur events and prevent clicking send until all errors handled	2017-09-25 21:45:51 -02:30
Dan	171d38c8db	Handles errors with to field and renders warnings from backend in send token.	2017-09-25 21:19:30 -02:30
Dan	0eeba3771c	Exports private key modal opens from dropdown.	2017-09-23 17:33:50 -07:00
Chi Kei Chan	e1077836ce	Add Confirm Send token screen	2017-09-22 14:38:17 -07:00
Dan	13f22ff6b0	get identities from getState() instead of passing from caller, only set new account label if label set.	2017-09-22 14:35:51 -07:00
Dan	a1d72a59fe	New account modal now allows for addition of account name.	2017-09-22 14:35:51 -07:00
Dan	e325e5e2f5	Default class params to empty string in readonly-input	2017-09-22 14:23:57 -07:00
Dan	48867d95fe	ReadOnlyInput component.	2017-09-22 14:23:57 -07:00
Dan Finlay	f9d2f523c6	Merge branch 'master' into AddBalanceController	2017-09-22 14:12:41 -07:00
Dan	fe37dd7ecd	Open account details modal on buy -> direct deposit.	2017-09-22 12:16:31 -07:00
Dan	14bdc5a78c	Client side error handling for from, to and amount fields in send.js	2017-09-22 12:10:30 -07:00
Chi Kei Chan	83cda2b82e	Refactor Confirmation Tx to render different screen	2017-09-21 22:25:16 -07:00
Chi Kei Chan	3ec2f53463	Integrate Add Token	2017-09-21 18:44:52 -07:00
Dan	24fd16b1be	Abstract account modal.	2017-09-21 16:45:18 -07:00
Dan	39afbea7aa	Confirm screen shows amount plus gas in total field	2017-09-21 16:43:29 -07:00
Dan	4fa79ffc6e	Clean up code in send.js	2017-09-21 16:42:55 -07:00
Dan	97810acb53	Handles errors with to field and renders warnings from backend in send token.	2017-09-21 16:41:52 -07:00
Chi Kei Chan	04da22db08	Add Token UI - hover/select state; fetch token address	2017-09-20 22:57:36 -07:00
Kevin Serrano	b22783a223	Merge branch 'master' into new-currency-test	2017-09-20 09:40:33 -07:00
Chi Kei Chan	0204aa2001	Add Add Token UI; Add Fuzzy search for tokens	2017-09-19 21:18:36 -07:00
Chi Kei Chan	e7f1fc4436	Buy Modal Styling	2017-09-19 18:49:35 -07:00
Dan	566ffee8cd	Ensure conversion util does not return insignificant trailing zeroes.	2017-09-19 12:56:51 -07:00
Chi Kei Chan	a67d3ecd46	Merge branch 'master' into NewUI-flat	2017-09-18 18:13:15 -07:00
Kevin Serrano	bd8428e9ed	Comply with current currency API and add additional styling.	2017-09-18 16:09:01 -07:00
Kevin Serrano	51cebcc173	Fix the property query for new currencies.	2017-09-18 12:20:41 -07:00
Roman Rodov	9af52ee1c5	Another merge conflict resolved.	2017-09-18 12:00:12 -07:00
Roman Rodov	f6f7798828	Resolve merge conflicts for currency sort merge.	2017-09-18 11:51:17 -07:00
Dan Finlay	fa50bf9587	Merge pull request #2075 from MetaMask/mixed-case ... Specific error for send screen: address checksum fails	2017-09-18 11:46:50 -07:00
Kevin Serrano	51f0911f87	Merge branch 'master' into new-currency-test	2017-09-18 11:46:10 -07:00
Chi Kei Chan	190330db92	Merge branch 'master' into NewUI-flat	2017-09-18 11:41:46 -07:00
Chi Kei Chan	162a3827c7	Fix Merge Problems; update yarn lock	2017-09-18 11:34:07 -07:00
Chi Kei Chan	6c5865d564	Merge branch 'master' into nm	2017-09-18 11:28:10 -07:00
Dan Finlay	545cbbebb9	Merge branch 'master' into fix-tooltip	2017-09-18 11:20:00 -07:00
Dan Finlay	67accea693	Merge branch 'master' into mixed-case	2017-09-18 11:17:00 -07:00
Dan	54bbf8d859	Handle transaction totals in WEI in tx-list, send and pending.	2017-09-15 16:23:23 -07:00
Dan	b0f1fba2e5	Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account'	2017-09-15 16:19:48 -07:00
Dan	feb90f2fc4	Clear token selection when changing account.	2017-09-15 16:18:48 -07:00
Dan	095d327140	Adds USD to token list.	2017-09-15 16:16:41 -07:00
Dan	ab77142c90	Show dollar sign before USD on account details page.	2017-09-15 16:10:34 -07:00
Dan	5c86194c0a	Show loading on conf-tx until the pending tx is available.	2017-09-14 15:45:18 -07:00
Chi Kei Chan	7d76e404f2	Make send token responsive; fix desktop send modal height	2017-09-14 11:45:59 -07:00
Chi Kei Chan	35d8671843	Add responsive UI to send ether modal	2017-09-14 09:56:40 -07:00
Kevin Serrano	456ceefcf7	Modify conversion to new api.	2017-09-14 09:14:57 -07:00
Kevin Serrano	cb8856597c	Merge branch 'master' into new-currency-test	2017-09-14 08:35:48 -07:00
Chi Kei Chan	4bcc62500f	Style send ether screen	2017-09-14 01:32:24 -07:00
Chi Kei Chan	93a1089e08	Show token tx properly	2017-09-14 01:09:57 -07:00
Chi Kei Chan	d722c1045f	Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate	2017-09-13 19:57:33 -07:00
Dan	6bd71d6937	Fix send and pending.	2017-09-13 16:30:39 -07:00
Dan Finlay	c17c657693	Merge branch 'master' into AddBalanceController	2017-09-13 15:11:03 -07:00
Dan Finlay	a01921758b	Add computed balance to account detail view	2017-09-13 15:06:04 -07:00
Dan Finlay	0ba6493175	Use computed balance for tx confirmation	2017-09-13 14:31:48 -07:00
Dan	ca46bd200b	Stop setting 'currentCurrency' and use local state for active currency in send.js	2017-09-13 14:25:20 -07:00
Dan	a5ab91e572	Enables Cancel button in confirmation screen.	2017-09-13 14:24:48 -07:00
Dan	e2dc9328fc	Send user to most recent pending transaction after sending a transaction.	2017-09-13 14:24:03 -07:00
Dan	09a4491bb1	Fix saving/sending of amounts in USD	2017-09-13 14:22:58 -07:00
Dan	55d62190e3	Fixes the saving of transactions in send and display in tx-list with conversion utility.	2017-09-13 14:22:58 -07:00
Dan	6fa1cd6225	Reapply conversion utility changes and fix calls to utility in pending-tx.	2017-09-13 14:22:30 -07:00
Kevin Serrano	a22a2586ab	Haha silly me, only when gas is estimated and not explicit.	2017-09-13 13:24:16 -07:00
Kevin Serrano	6e725b123b	Lower warning threshold for high tx fee to account for fluctuating blockGasLimits	2017-09-13 12:22:08 -07:00
Kevin Serrano	06153dd47d	Add warning of higher failure risk since app proposed gasLimit.	2017-09-13 12:17:42 -07:00
Chi Kei Chan	8f31b05ac5	Add token exchange rates	2017-09-13 01:25:39 -07:00
Chi Kei Chan	8b5f2a95df	Improve styling in Confirmation Screen; Show decoded send token data	2017-09-12 23:04:01 -07:00
Chi Kei Chan	b64471833f	Revert "Overhaul currency conversion utility and update calls to utility in pending-tx." ... This reverts commit 080890a46e.	2017-09-12 23:04:01 -07:00
Kevin Serrano	962794d025	fixed position of tooltips to avoid overflow.	2017-09-12 16:15:56 -07:00
Dan	080890a46e	Overhaul currency conversion utility and update calls to utility in pending-tx.	2017-09-12 16:05:59 -07:00
Dan Finlay	7ed1fe90f8	Fix support link	2017-09-12 15:07:08 -07:00
Dan J Miller	492507aa94	[NewUI] Color tx-list-item text depending on transaction status. (#2050) ... * Color tx-list-item text depending on transaction status. * Handle css change of text colour with scss instead on inline styles, add classnames package and helper function. * Refactored to use classnames with component property className.	2017-09-12 14:59:33 -07:00
Kevin Serrano	ef6967325e	Check if all lower or upper before doing checksum.	2017-09-12 12:52:13 -07:00
Kevin Serrano	7810880f0c	Add specific error message for failed address checksum.	2017-09-12 12:23:21 -07:00
Kevin Serrano	ad14e9338d	Convert state logs into a download.	2017-09-12 09:34:48 -07:00
Chi Kei Chan	7eb6dae418	Added signTokenTx; Adding token confirmation screen	2017-09-12 02:22:23 -07:00
Chi Kei Chan	836bf2e1a3	Add frontend validation to send-token	2017-09-11 23:18:54 -07:00
Dan J Miller	1e83835ba8	[New-UI] Confirm Screen restyle and connect to state (#2042) ... * Adds utility for converting currencies (WIP) * Implements confirm screen * Style tweaks. * Confirm screen total ammount now uses real data. * Confirm screen total ammount now uses real data. * Replace content divider with sibling css. * Replace section divider with scss.	2017-09-11 22:19:05 -07:00
Chi Kei Chan	062e67bff8	Add buttons; handle back; add yarn.lock	2017-09-11 22:14:09 -07:00
Dan	392d0d020c	Use transparent border for consistent size with and without border.	2017-09-11 19:16:43 -07:00
Dan	8342c20b58	Cleaner css for circle icon.	2017-09-11 19:16:43 -07:00
Dan	6beb1b33bb	Replace checkmark with font-awesome equivalent.	2017-09-11 19:16:43 -07:00
Dan	99047e3ef4	Adds title, divider and descriptive text to network dropdown.	2017-09-11 19:16:43 -07:00
Dan	6a3c59e409	Highlighted circle icons for the network menu.	2017-09-11 19:16:43 -07:00
Kevin Serrano	213af0cd6c	Fix typo.	2017-09-11 16:52:35 -07:00
Kevin Serrano	e7c1a11b4d	Add ability to save seed words as file.	2017-09-11 16:48:02 -07:00
Kevin Serrano	aa021b9209	Add some styling.	2017-09-11 16:40:45 -07:00
Kevin Serrano	fa1ec5dcd1	Move function as util function.	2017-09-11 16:22:20 -07:00
Kevin Serrano	3a7d4a5d4e	Basic private key download file functionality.	2017-09-11 16:13:28 -07:00
Kevin Serrano	27ba7f6ed3	Show reject all only when tx count is > 1	2017-09-11 14:12:35 -07:00
Kevin Serrano	2e18dd27a4	Merge github.com:MetaMask/metamask-extension into rejectallunapproved	2017-09-11 13:58:46 -07:00
Chi Kei Chan	663cb758b3	Style send token screen	2017-09-11 00:45:06 -07:00
Thomas Huang	430d6d20f1	Merge pull request #2047 from MetaMask/i1997-networkindicate ... Add caret to dropdown network selector	2017-09-08 14:38:00 -07:00
Dan	395e8bfce0	Use width 100 and margin for the new modal input.	2017-09-08 10:56:56 -07:00
Dan	5a8433b6ce	New account modal top right close button working.	2017-09-08 10:56:56 -07:00
Dan	ab4005cab8	Tweak styles in new-account-modal.	2017-09-08 10:56:56 -07:00
Kevin Serrano	0e6c11a3b5	Fix typo.	2017-09-07 18:01:39 -07:00
Kevin Serrano	54a5a117d5	Fix link to open new tab.	2017-09-07 18:00:45 -07:00
Kevin Serrano	6560a2c3af	Add front-end validation for own adddresses as a token contract address. Add information on token contract addresses.	2017-09-07 17:55:34 -07:00
Kevin Serrano	54fb8e8cef	Add cursor on hover on loading. Change some wording.	2017-09-07 16:26:31 -07:00
Kevin Serrano	8d7f78c1a5	Add caret to indicate network is dropdown.	2017-09-07 16:18:32 -07:00
Dan Finlay	64717726c4	Reword forgot password to restore seed phrase ... This always confuses people, I just finally did it.	2017-09-07 15:27:40 -07:00
Kevin Serrano	41e9904d9b	Convert icon to button.	2017-09-07 15:03:25 -07:00
Kevin Serrano	3a87a30912	Fold submit and buy ether into one button slot	2017-09-07 13:55:59 -07:00
Kevin Serrano	34e7bb5015	Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved	2017-09-07 13:20:14 -07:00
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -07:00
Kevin Serrano	f0ab4ce52d	Change expected type to array.	2017-09-07 11:51:04 -07:00
Chi Kei Chan	272ade0f66	Fix .filter token tx	2017-09-07 11:46:05 -07:00
Chi Kei Chan	ca69fa5d91	Re-enable Contract tx list item	2017-09-07 11:38:21 -07:00
Chi Kei Chan	687d2f755d	Fix css merge conflicts	2017-09-07 11:25:31 -07:00
Dan	a0ca3fab77	Modify readonly value in for input in qr-code.	2017-09-07 10:26:21 -07:00
Dan	c4eb2fb3ea	Account-detail address is a readonly input.	2017-09-07 10:26:21 -07:00
Dan	1d5a725ffb	Close button in account-details-modal working.	2017-09-07 10:26:21 -07:00
Dan	b8b0c8c62a	Remove highlight on modal	2017-09-07 10:26:21 -07:00
Dan	61b965fe14	Touch up style of account-details-modal.	2017-09-07 10:26:21 -07:00
Dan	7fb1c6836d	Modify status copy for status === 'unapproved'	2017-09-07 10:25:56 -07:00
Dan	eabbfb8319	Link user from transaction list to etherscan if they have a transaction hash.	2017-09-07 10:25:56 -07:00
Dan	3e6b619bd8	Use ternary operator instead of two conditionals.	2017-09-07 10:25:56 -07:00
Dan	64f8a4d22b	Improve tx-list item hover scss.	2017-09-07 10:25:56 -07:00
Dan	17b5afb8de	Create tx-list-item component.	2017-09-07 10:25:56 -07:00
Dan	6d3b3d4203	Show confirm transaction screen when clicking a pending transaction in the list.	2017-09-07 10:25:56 -07:00
Dan	aa60944e30	Remove default to confirm screen on login.	2017-09-07 10:25:56 -07:00
Chi Kei Chan	b670c8074e	Fix font sizes on Send Token	2017-09-07 04:26:29 -07:00
Chi Kei Chan	8b919758e5	Send Token screen partial UI	2017-09-07 04:24:03 -07:00
Chi Kei Chan	983fa2a117	Add Contract Tx List Item; Update Token Tx on select	2017-09-07 03:14:53 -07:00
Chi Kei Chan	14b2f3e391	Show token balance and identicon	2017-09-06 23:03:23 -07:00
Chi Kei Chan	f1fb9e10a0	Adding Token transaction detail screen	2017-09-06 03:17:49 -07:00
Chi Kei Chan	690ddf5ed7	Fix token list	2017-09-06 00:36:52 -07:00
Chi Kei Chan	06b2a04a42	Implement tokens list UI	2017-09-06 00:36:31 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Dan	562d2fadae	Use .entries() instead of .keys(), and use more destructuring, for simpler code.	2017-09-05 13:00:50 -07:00
Dan	78f39bcce6	Send tx working; user is taken to confirm page with correct transaction information.	2017-09-05 13:00:50 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
Kevin Serrano	162aedb30b	Merge branch 'master' into new-currency-test	2017-09-05 09:01:05 -07:00
Dan	6ef483be4a	Remove wallet-view scrollbars.	2017-09-04 18:46:14 -07:00
Dan	7d6ad48f15	Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content..	2017-09-04 18:46:14 -07:00