aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-06-29 08:59:22 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-06-29 08:59:22 +0800
commitaf999e2beef6cbb7ba16a341ccd23c64573611a2 (patch)
tree7488e3c03d05f695fed5a4fe3f1302fab008b768 /ui/app
parent56cbd7d9eab76eeb55638766e16ea4c0ceb96962 (diff)
parente4956c3123a23cf4bddaf2617e36456735fddced (diff)
downloadtangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar.gz
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar.bz2
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar.lz
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar.xz
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.tar.zst
tangerine-wallet-browser-af999e2beef6cbb7ba16a341ccd23c64573611a2.zip
Merge branch 'master' into networkDropdownFix
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/app.js4
-rw-r--r--ui/app/components/network.js4
-rw-r--r--ui/app/css/lib.css26
3 files changed, 16 insertions, 18 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 13770412d..8f3cce886 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -213,14 +213,14 @@ App.prototype.renderNetworkDropdown = function () {
label: 'Main Ethereum Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => props.dispatch(actions.setProviderType('mainnet')),
- icon: h('.menu-icon.ether-icon'),
+ icon: h('.menu-icon.diamond'),
}),
h(DropMenuItem, {
label: 'Morden Test Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => props.dispatch(actions.setProviderType('testnet')),
- icon: h('.menu-icon.morden-icon'),
+ icon: h('.menu-icon.red-dot'),
}),
h(DropMenuItem, {
diff --git a/ui/app/components/network.js b/ui/app/components/network.js
index 771be5f32..9f7287371 100644
--- a/ui/app/components/network.js
+++ b/ui/app/components/network.js
@@ -47,9 +47,9 @@ Network.prototype.render = function () {
(function () {
switch (iconName) {
case 'ethereum-network':
- return h('.menu-icon.ether-icon')
+ return h('.menu-icon.diamond')
case 'morden-test-network':
- return h('.menu-icon.morden-icon')
+ return h('.menu-icon.red-dot')
default:
return h('i.fa.fa-question-circle.fa-lg', {
ariaHidden: true,
diff --git a/ui/app/css/lib.css b/ui/app/css/lib.css
index dca73a6e8..a7da11e77 100644
--- a/ui/app/css/lib.css
+++ b/ui/app/css/lib.css
@@ -168,27 +168,25 @@ hr.horizontal-line {
}
.red-dot {
- position: inherit;
- background: red;
+ background: #E91550;
color: white;
border-radius: 10px;
- height: 12px;
- min-width: 12px;
- margin-left: 6px;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 4px;
+}
+
+.diamond {
+ transform: rotate(45deg);
+ background: #038789;
}
.pending-dot {
background: red;
- left: 57px;
+ left: 14px;
+ top: 14px;
color: white;
border-radius: 10px;
height: 20px;
min-width: 20px;
- position: absolute;
+ position: relative;
display: flex;
align-items: center;
justify-content: center;
@@ -202,8 +200,8 @@ hr.horizontal-line {
.menu-icon {
display: inline-block;
- width: 14px;
- height: 14px;
+ height: 9px;
+ min-width: 9px;
margin: 13px;
}
.ether-icon {
@@ -221,4 +219,4 @@ hr.horizontal-line {
.invisible {
visibility: hidden;
-} \ No newline at end of file
+}