diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-07-27 05:27:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 05:27:14 +0800 |
| commit | bc11f11d6865de0950d9ab10e8f37f74519b824e (patch) | |
| tree | 380b3e3c207a14647ce2d48217fc79f6c2eeb999 | |
| parent | 0ea6749dbc923a6e796b1de4bbd301d931739b9d (diff) | |
| parent | 8006d798ee8d1993ef4b06cce25480f0aea6c4f4 (diff) | |
| download | tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.gz tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.bz2 tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.lz tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.xz tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.zst tangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.zip | |
Merge pull request #1831 from sdtsui/pre-merge-fixes
Add minor fixes, including account selection scroll
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | ui/app/app.js | 4 | ||||
| -rw-r--r-- | ui/app/components/account-dropdowns.js | 10 | ||||
| -rw-r--r-- | ui/app/components/dropdown.js | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/package.json b/package.json index c1d83107b..2af3e9ec2 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "inject-css": "^0.1.1", "jazzicon": "^1.2.0", "loglevel": "^1.4.1", - "menu-droppo": "1.1.6", + "menu-droppo": "2.0.0", "metamask-logo": "^2.1.2", "mississippi": "^1.2.0", "mkdirp": "^0.5.1", diff --git a/ui/app/app.js b/ui/app/app.js index 6da48b9b6..4ecc6d6d5 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -206,7 +206,9 @@ App.prototype.renderNetworkDropdown = function () { left: '2px', top: '36px', }, - innerStyle: {}, + innerStyle: { + padding: '2px 16px 2px 0px', + }, }, [ h( diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index d1d319477..61f32f713 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -59,6 +59,8 @@ class AccountDropdowns extends Component { style: { marginLeft: '-125px', minWidth: '180px', + overflowY: 'auto', + maxHeight: '300px', }, isOpen: accountSelectorActive, onClickOutside: () => { this.setState({ accountSelectorActive: false }) }, @@ -120,14 +122,6 @@ class AccountDropdowns extends Component { DropdownMenuItem, { closeMenu: () => {}, - onClick: () => actions.showConfigPage(), - }, - 'Account Settings', - ), - h( - DropdownMenuItem, - { - closeMenu: () => {}, onClick: () => { const { selected, network } = this.props const url = genAccountLink(selected, network) diff --git a/ui/app/components/dropdown.js b/ui/app/components/dropdown.js index e77b4c40c..70ed388f4 100644 --- a/ui/app/components/dropdown.js +++ b/ui/app/components/dropdown.js @@ -7,7 +7,7 @@ const noop = () => {} class Dropdown extends Component { render () { - const { isOpen, onClickOutside, style, children } = this.props + const { isOpen, onClickOutside, style, innerStyle, children } = this.props return h( MenuDroppo, @@ -21,6 +21,7 @@ class Dropdown extends Component { padding: '8px 16px', background: 'rgba(0, 0, 0, 0.8)', boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px', + ...innerStyle, }, }, [ |