aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-07-07 11:24:28 +0800
committerGitHub <noreply@github.com>2016-07-07 11:24:28 +0800
commita038eed6e3fc678246bc880afb0dacf9defac8e2 (patch)
tree7edc81cfbc7b78e789b89ec3afca23a81f9fb693
parentfb363b8a62f350fc447a82f30908a4ec1b8625d9 (diff)
parentacdd40e3bebe561d28fd776044f3ecf71fcf81ea (diff)
downloadtangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar.gz
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar.bz2
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar.lz
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar.xz
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.tar.zst
tangerine-wallet-browser-a038eed6e3fc678246bc880afb0dacf9defac8e2.zip
Merge pull request #402 from MetaMask/z-position-fix
Fix dropdown z-index issue.
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/app.js6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cb788a0d..62dc166a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Fix formatting of ETH balance
- Fix formatting of account details.
+- Fix issue where dropdowns were not in front of icons.
## 2.5.0 2016-06-29
diff --git a/ui/app/app.js b/ui/app/app.js
index dcc44ee65..4dd41d570 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -108,7 +108,7 @@ App.prototype.renderAppBar = function () {
background: props.isUnlocked ? 'white' : 'none',
height: '36px',
position: 'relative',
- zIndex: 1,
+ zIndex: 2,
},
}, props.isUnlocked && [
@@ -197,10 +197,10 @@ App.prototype.renderNetworkDropdown = function () {
onClickOutside: (event) => {
this.setState({ isNetworkMenuOpen: !isOpen })
},
+ zIndex: 1,
style: {
position: 'absolute',
left: 0,
- zIndex: 0,
},
innerStyle: {
background: 'white',
@@ -245,13 +245,13 @@ App.prototype.renderDropdown = function () {
return h(MenuDroppo, {
isOpen: isOpen,
+ zIndex: 1,
onClickOutside: (event) => {
this.setState({ isMainMenuOpen: !isOpen })
},
style: {
position: 'absolute',
right: 0,
- zIndex: 0,
},
innerStyle: {
background: 'white',