aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/dropdown.js
diff options
context:
space:
mode:
authorDan Finlay <flyswatter@users.noreply.github.com>2017-07-27 05:27:14 +0800
committerGitHub <noreply@github.com>2017-07-27 05:27:14 +0800
commitbc11f11d6865de0950d9ab10e8f37f74519b824e (patch)
tree380b3e3c207a14647ce2d48217fc79f6c2eeb999 /ui/app/components/dropdown.js
parent0ea6749dbc923a6e796b1de4bbd301d931739b9d (diff)
parent8006d798ee8d1993ef4b06cce25480f0aea6c4f4 (diff)
downloadtangerine-wallet-browser-bc11f11d6865de0950d9ab10e8f37f74519b824e.tar.gz
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
Diffstat (limited to 'ui/app/components/dropdown.js')
-rw-r--r--ui/app/components/dropdown.js3
1 files changed, 2 insertions, 1 deletions
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,
},
},
[