From fbb91c12b3bc212a1ef4550705ffd312fd591bde Mon Sep 17 00:00:00 2001 From: EOS Classic Date: Sat, 18 Aug 2018 23:36:15 +0900 Subject: [PATCH 1/3] [ETC] Refactor node list, fix css style for network tab --- app/scripts/nodes.js | 18 ++++++------ app/styles/etherwallet-custom.less | 44 ++++++++++++++++-------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/app/scripts/nodes.js b/app/scripts/nodes.js index 28955b263f..ae4e178f64 100644 --- a/app/scripts/nodes.js +++ b/app/scripts/nodes.js @@ -90,7 +90,7 @@ nodes.nodeList = { service: "giveth.io", lib: new nodes.customNode("https://mew.giveth.io", "") }, - etc_gastracker: { + etc_etccoop: { name: "ETC", blockExplorerTX: "https://gastracker.io/tx/[[txHash]]", blockExplorerAddr: "https://gastracker.io/addr/[[address]]", @@ -99,10 +99,10 @@ nodes.nodeList = { chainId: 61, tokenList: require("./tokens/etcTokens.json"), abiList: require("./abiDefinitions/etcAbi.json"), - service: "GasTracker", - lib: new nodes.customNode("https://web3.gastracker.io", "") + service: "ETC Cooperative", + lib: new nodes.customNode("https://ethereumclassic.network", "") }, - etc_epool: { + etc_gastracker: { name: "ETC", blockExplorerTX: "https://gastracker.io/tx/[[txHash]]", blockExplorerAddr: "https://gastracker.io/addr/[[address]]", @@ -111,10 +111,10 @@ nodes.nodeList = { chainId: 61, tokenList: require("./tokens/etcTokens.json"), abiList: require("./abiDefinitions/etcAbi.json"), - service: "epool.io", - lib: new nodes.customNode("https://mew.epool.io", "") + service: "GasTracker", + lib: new nodes.customNode("https://web3.gastracker.io", "") }, - etc_etccoop: { + etc_epool: { name: "ETC", blockExplorerTX: "https://gastracker.io/tx/[[txHash]]", blockExplorerAddr: "https://gastracker.io/addr/[[address]]", @@ -123,8 +123,8 @@ nodes.nodeList = { chainId: 61, tokenList: require("./tokens/etcTokens.json"), abiList: require("./abiDefinitions/etcAbi.json"), - service: "ETC Cooperative", - lib: new nodes.customNode("https://ethereumclassic.network", "") + service: "epool.io", + lib: new nodes.customNode("https://mew.epool.io", "") }, rop_mew: { name: "Ropsten", diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less index bc9cec8703..ccaad9de84 100644 --- a/app/styles/etherwallet-custom.less +++ b/app/styles/etherwallet-custom.less @@ -626,60 +626,61 @@ label small { border-left: 2px solid @brand-eth; } li:nth-child(5), - li:nth-child(6) { + li:nth-child(6), + li:nth-child(7) { border-left: 2px solid @brand-etc; } - li:nth-child(7), li:nth-child(8), li:nth-child(9), li:nth-child(10), li:nth-child(11), - li:nth-child(12) { + li:nth-child(12), + li:nth-child(13) { border-left: 2px solid @brand-test; } - li:nth-child(13) { + li:nth-child(14) { border-left: 2px solid @brand-exp; } - li:nth-child(14) { + li:nth-child(15) { border-left: 2px solid @brand-ubq; } - li:nth-child(15) { + li:nth-child(16) { border-left: 2px solid @brand-poa; } - li:nth-child(16) { + li:nth-child(17) { border-left: 2px solid @brand-tomo; } - li:nth-child(17) { + li:nth-child(18) { border-left: 2px solid @brand-ella; } - li:nth-child(18) { + li:nth-child(19) { border-left: 2px solid @brand-etsc; } - li:nth-child(19) { + li:nth-child(20) { border-left: 2px solid @brand-egem; } - li:nth-child(20) { + li:nth-child(21) { border-left: 2px solid @brand-clo; } - li:nth-child(21) { + li:nth-child(22) { border-left: 2px solid @brand-music; } - li:nth-child(22) { + li:nth-child(23) { border-left: 2px solid @brand-go; } - li:nth-child(23) { + li:nth-child(24) { border-left: 2px solid @brand-eosc; } - li:nth-child(24) { + li:nth-child(25) { border-left: 2px solid @brand-akroma; } - li:nth-child(25) { + li:nth-child(26) { border-left: 2px solid @brand-esn; } - li:nth-child(26) { + li:nth-child(27) { border-left: 2px solid @brand-pirl; } - li:nth-child(27) { + li:nth-child(28) { border-left: 2px solid @brand-etho; } @@ -687,8 +688,7 @@ label small { border-left: 2px solid @gray-light; } li:nth-child(4), - li:nth-child(6), - li:nth-child(12), + li:nth-child(7), li:nth-child(13), li:nth-child(14), li:nth-child(15), @@ -702,7 +702,9 @@ label small { li:nth-child(23), li:nth-child(24), li:nth-child(25), - li:nth-child(26) { + li:nth-child(26), + li:nth-child(27), + li:nth-child(28) { border-bottom: 1px solid @gray-lighter; } } From 4644bd3652b26c86e027111e4ecf51c924247840 Mon Sep 17 00:00:00 2001 From: EOS Classic Date: Sat, 18 Aug 2018 23:36:50 +0900 Subject: [PATCH 2/3] [Network] Move coin svg images to internal directory --- app/images/{ => coins}/akroma.svg | 0 app/images/{ => coins}/callisto.svg | 0 app/images/{ => coins}/egem.svg | 0 app/images/{ => coins}/ella.svg | 0 app/images/{ => coins}/eosc.svg | 0 app/images/{ => coins}/ethereum-classic.svg | 0 app/images/{ => coins}/ethereum.svg | 0 app/images/{ => coins}/ethersocial.svg | 0 app/images/{ => coins}/etho.svg | 0 app/images/{ => coins}/etsc.svg | 0 app/images/{ => coins}/exp.svg | 0 app/images/{ => coins}/gochain.svg | 0 app/images/{ => coins}/music.svg | 0 app/images/{ => coins}/pirl.svg | 0 app/images/{ => coins}/poa.svg | 0 app/images/{ => coins}/tomo.svg | 0 app/images/{ => coins}/ubiq.svg | 0 app/styles/etherwallet-custom.less | 34 ++++++++++----------- 18 files changed, 17 insertions(+), 17 deletions(-) rename app/images/{ => coins}/akroma.svg (100%) rename app/images/{ => coins}/callisto.svg (100%) rename app/images/{ => coins}/egem.svg (100%) rename app/images/{ => coins}/ella.svg (100%) rename app/images/{ => coins}/eosc.svg (100%) rename app/images/{ => coins}/ethereum-classic.svg (100%) rename app/images/{ => coins}/ethereum.svg (100%) rename app/images/{ => coins}/ethersocial.svg (100%) rename app/images/{ => coins}/etho.svg (100%) rename app/images/{ => coins}/etsc.svg (100%) rename app/images/{ => coins}/exp.svg (100%) rename app/images/{ => coins}/gochain.svg (100%) rename app/images/{ => coins}/music.svg (100%) rename app/images/{ => coins}/pirl.svg (100%) rename app/images/{ => coins}/poa.svg (100%) rename app/images/{ => coins}/tomo.svg (100%) rename app/images/{ => coins}/ubiq.svg (100%) diff --git a/app/images/akroma.svg b/app/images/coins/akroma.svg similarity index 100% rename from app/images/akroma.svg rename to app/images/coins/akroma.svg diff --git a/app/images/callisto.svg b/app/images/coins/callisto.svg similarity index 100% rename from app/images/callisto.svg rename to app/images/coins/callisto.svg diff --git a/app/images/egem.svg b/app/images/coins/egem.svg similarity index 100% rename from app/images/egem.svg rename to app/images/coins/egem.svg diff --git a/app/images/ella.svg b/app/images/coins/ella.svg similarity index 100% rename from app/images/ella.svg rename to app/images/coins/ella.svg diff --git a/app/images/eosc.svg b/app/images/coins/eosc.svg similarity index 100% rename from app/images/eosc.svg rename to app/images/coins/eosc.svg diff --git a/app/images/ethereum-classic.svg b/app/images/coins/ethereum-classic.svg similarity index 100% rename from app/images/ethereum-classic.svg rename to app/images/coins/ethereum-classic.svg diff --git a/app/images/ethereum.svg b/app/images/coins/ethereum.svg similarity index 100% rename from app/images/ethereum.svg rename to app/images/coins/ethereum.svg diff --git a/app/images/ethersocial.svg b/app/images/coins/ethersocial.svg similarity index 100% rename from app/images/ethersocial.svg rename to app/images/coins/ethersocial.svg diff --git a/app/images/etho.svg b/app/images/coins/etho.svg similarity index 100% rename from app/images/etho.svg rename to app/images/coins/etho.svg diff --git a/app/images/etsc.svg b/app/images/coins/etsc.svg similarity index 100% rename from app/images/etsc.svg rename to app/images/coins/etsc.svg diff --git a/app/images/exp.svg b/app/images/coins/exp.svg similarity index 100% rename from app/images/exp.svg rename to app/images/coins/exp.svg diff --git a/app/images/gochain.svg b/app/images/coins/gochain.svg similarity index 100% rename from app/images/gochain.svg rename to app/images/coins/gochain.svg diff --git a/app/images/music.svg b/app/images/coins/music.svg similarity index 100% rename from app/images/music.svg rename to app/images/coins/music.svg diff --git a/app/images/pirl.svg b/app/images/coins/pirl.svg similarity index 100% rename from app/images/pirl.svg rename to app/images/coins/pirl.svg diff --git a/app/images/poa.svg b/app/images/coins/poa.svg similarity index 100% rename from app/images/poa.svg rename to app/images/coins/poa.svg diff --git a/app/images/tomo.svg b/app/images/coins/tomo.svg similarity index 100% rename from app/images/tomo.svg rename to app/images/coins/tomo.svg diff --git a/app/images/ubiq.svg b/app/images/coins/ubiq.svg similarity index 100% rename from app/images/ubiq.svg rename to app/images/coins/ubiq.svg diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less index ccaad9de84..189fbab565 100644 --- a/app/styles/etherwallet-custom.less +++ b/app/styles/etherwallet-custom.less @@ -719,7 +719,7 @@ header.ETH { & + .container .alert-info { background-color:@brand-eth; } .dropdown-gas:before { width: 24px; - background-image: url("../images/ethereum.svg"); + background-image: url("../images/coins/ethereum.svg"); } } @@ -730,7 +730,7 @@ header.ETC { & + .container .alert-info { background-color:@brand-etc; } .dropdown-gas:before { width: 24px; - background-image: url("../images/ethereum-classic.svg"); + background-image: url("../images/coins/ethereum-classic.svg"); } } @@ -769,7 +769,7 @@ header.EXP { & + .container .alert-info { background-color:@brand-exp; } .dropdown-gas:before { width: 32px; - background-image: url("../images/exp.svg"); + background-image: url("../images/coins/exp.svg"); } } @@ -780,7 +780,7 @@ header.UBQ { & + .container .alert-info { background-color:@brand-ubq; } .dropdown-gas:before { width: 32px; - background-image: url("../images/ubiq.svg"); + background-image: url("../images/coins/ubiq.svg"); } } @@ -791,7 +791,7 @@ header.POA { & + .container .alert-info { background-color:@brand-poa; } .dropdown-gas:before { width: 32px; - background-image: url("../images/poa.svg"); + background-image: url("../images/coins/poa.svg"); } } @@ -802,7 +802,7 @@ header.TOMO { & + .container .alert-info { background-color:@brand-tomo; } .dropdown-gas:before { width: 34px; - background-image: url("../images/tomo.svg"); + background-image: url("../images/coins/tomo.svg"); } } @@ -813,7 +813,7 @@ header.ELLA { & + .container .alert-info { background-color:@brand-ella; } .dropdown-gas:before { width: 32px; - background-image: url("../images/ella.svg"); + background-image: url("../images/coins/ella.svg"); } } @@ -824,7 +824,7 @@ header.ETSC { & + .container .alert-info { background-color:@brand-etsc; } .dropdown-gas:before { width: 32px; - background-image: url("../images/etsc.svg"); + background-image: url("../images/coins/etsc.svg"); } } @@ -835,7 +835,7 @@ header.EGEM { & + .container .alert-info { background-color:@brand-egem; } .dropdown-gas:before { width: 36px; - background-image: url("../images/egem.svg"); + background-image: url("../images/coins/egem.svg"); } } @@ -846,7 +846,7 @@ header.CLO { & + .container .alert-info { background-color:@brand-clo; } .dropdown-gas:before { width: 36px; - background-image: url("../images/callisto.svg"); + background-image: url("../images/coins/callisto.svg"); } } @@ -858,7 +858,7 @@ header.MUSIC { & + .container .alert-info { background-color:@brand-music; } .dropdown-gas:before { width: 34px; - background-image: url("../images/music.svg"); + background-image: url("../images/coins/music.svg"); } } @@ -869,7 +869,7 @@ header.GO { & + .container .alert-info { background-color:@brand-go; } .dropdown-gas:before { width: 38px; - background-image: url("../images/gochain.svg"); + background-image: url("../images/coins/gochain.svg"); } } @@ -880,7 +880,7 @@ header.EOSC { & + .container .alert-info { background-color:@brand-eosc; } .dropdown-gas:before { width: 26px; - background-image: url("../images/eosc.svg"); + background-image: url("../images/coins/eosc.svg"); } } @@ -891,7 +891,7 @@ header.AKROMA { & + .container .alert-info { background-color:@brand-akroma; } .dropdown-gas:before { width: 34px; - background-image: url("../images/akroma.svg"); + background-image: url("../images/coins/akroma.svg"); } } @@ -902,7 +902,7 @@ header.ESN { & + .container .alert-info { background-color:@brand-esn; } .dropdown-gas:before { width: 32px; - background-image: url("../images/ethersocial.svg"); + background-image: url("../images/coins/ethersocial.svg"); } } @@ -913,7 +913,7 @@ header.PIRL { & + .container .alert-info { background-color:@brand-pirl; } .dropdown-gas:before { width: 32px; - background-image: url("../images/pirl.svg"); + background-image: url("../images/coins/pirl.svg"); } } @@ -924,7 +924,7 @@ header.ETHO { & + .container .alert-info { background-color:@brand-etho; } .dropdown-gas:before { width: 24px; - background-image: url("../images/etho.svg"); + background-image: url("../images/coins/etho.svg"); } } From 61a4c7802305e7527aa36c0ce94d9d97a21a822c Mon Sep 17 00:00:00 2001 From: EOS Classic Date: Tue, 21 Aug 2018 09:37:42 +0900 Subject: [PATCH 3/3] Remove last child --- app/styles/etherwallet-custom.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/styles/etherwallet-custom.less b/app/styles/etherwallet-custom.less index 189fbab565..323de4ad57 100644 --- a/app/styles/etherwallet-custom.less +++ b/app/styles/etherwallet-custom.less @@ -703,8 +703,7 @@ label small { li:nth-child(24), li:nth-child(25), li:nth-child(26), - li:nth-child(27), - li:nth-child(28) { + li:nth-child(27) { border-bottom: 1px solid @gray-lighter; } }