diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-08-05 04:22:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-05 04:22:25 +0800 |
commit | 5f8a2ea1e69ccb26c412afe34d21ae37b26eef43 (patch) | |
tree | 7fa48bca557b104e729e5c6bbdb7546d8f38437f /ui/app/components/dropdown.js | |
parent | d7168d7c507bd4cef30e714a15a1b4a6f13a8f81 (diff) | |
parent | 4d967ebea99b8c1a899a91e379a1fa12015b7e53 (diff) | |
download | tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar.gz tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar.bz2 tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar.lz tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar.xz tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.tar.zst tangerine-wallet-browser-5f8a2ea1e69ccb26c412afe34d21ae37b26eef43.zip |
Merge pull request #1862 from sdtsui/add-rct
Re-enable css transitions, only for dropdowns in app header
Diffstat (limited to 'ui/app/components/dropdown.js')
-rw-r--r-- | ui/app/components/dropdown.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/app/components/dropdown.js b/ui/app/components/dropdown.js index 8cdfc13e8..34c7149ee 100644 --- a/ui/app/components/dropdown.js +++ b/ui/app/components/dropdown.js @@ -1,14 +1,14 @@ const Component = require('react').Component const PropTypes = require('react').PropTypes const h = require('react-hyperscript') -const MenuDroppo = require('menu-droppo') +const MenuDroppo = require('./menu-droppo') const extend = require('xtend') const noop = () => {} class Dropdown extends Component { render () { - const { isOpen, onClickOutside, style, innerStyle, children } = this.props + const { isOpen, onClickOutside, style, innerStyle, children, useCssTransition } = this.props const innerStyleDefaults = extend({ borderRadius: '4px', @@ -20,6 +20,7 @@ class Dropdown extends Component { return h( MenuDroppo, { + useCssTransition, isOpen, zIndex: 11, onClickOutside, @@ -43,6 +44,7 @@ class Dropdown extends Component { Dropdown.defaultProps = { isOpen: false, onClick: noop, + useCssTransition: false, } Dropdown.propTypes = { |