From 3c4ab85ff08ab71ccabe1e7a0d06c59e9ae4e972 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 11:16:40 +0300 Subject: [PATCH 1/6] Add files via upload --- .../assets/static/images/icons/etherscan.png | Bin 0 -> 1826 bytes .../assets/static/images/icons/etherscan@2x.png | Bin 0 -> 3489 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/block_scout_web/assets/static/images/icons/etherscan.png create mode 100644 apps/block_scout_web/assets/static/images/icons/etherscan@2x.png diff --git a/apps/block_scout_web/assets/static/images/icons/etherscan.png b/apps/block_scout_web/assets/static/images/icons/etherscan.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bcd4bcdb31b276a5699a905ffb7995d226e508 GIT binary patch literal 1826 zcmaJ?eKb^Q9G+6?V-%gDufuIbg_%2ZXEbK=k&KDVpc&;OS!3ohbIi;gcP@sK4sF%Glr z;i`oM0>Q}BgCoG#CHQMRe;)qT?XsGKFDo(k08EI4W3eI>Cb&wFFc|Puh$3JCERw`U z>0n0!!C-^TF8~YR^VniUK@sUO6pccKvk3%87mZ3Jj)XBF433Z~ok&BqbtFJ0aU%KK z^QnB58!VN1#G|k<-rG+cA1P)@NG{HRqlS$OC}2zkXcTg#nyqmnP3p4oz1|FxfJq1z z=|uVzQ~=)>a6?cSu%~Pyi>aHK0FyO zs3e>%;BY_t!cR^lDTb-oAQ&4PONpgZ5Htd$u~;mS3V{$r#t~$7oDvgh$V#>4lmZ7< zi&2>hlOak#uP6#bqA@2D9_gnP6sl=irTTN3@PdIFkqV?ysQQ$qfPDV{Lluf?v>Fq@ zU*i2wVYOeJ3I+wR8i_{5c;mt?^{!NGHxw3O2d+JuiPFyW7Nk7$-zn;Zved9dTRQOHU0wTXKsW4zw z^5uyXq}wRQ*}J@^YHsG!p1Vf^oBxVM?9<;~>#4cf%-mul3ca(zb;8H=wfn8Z>kn}g zPZ+&4Xe8Lo1*~$w*^v)y;=A&~ea2q&u^(6dnrwG2nBw2Icl?*GYq|rA@{B@LUnh3*3i*vcJoGRo>5I5SodsQW+T>HUu)Ks@-n@pWFjw;5cw@n`oK`YqU}Bqq+M2BbAA!AwIQg)JaLfq0c7vmRHZGw-k1Jp zcSW=8{Kloj+h^5244%LoD$XVgGSKS>s!o<0x(q$KTs)k6wd@%;vHR}_<$>exJ{-&H zNDz?C`L>y+uj1NI^y1MT_G+wcCO;EvVY~Qlwwi5olthcS3)1Qylq*LB-(^?<-Zp<2P=iGSJ zmR{TO6moI6d;YY=m3MIe#onA`>o{KM_g6^O38(mXQ<^=AUHO>g!YV?_y*t{PkJnai^&anOIeD+J$z+R8E3-^_ zti44Z?$|yQ=CBXzJ$*3g+0LIO5cLGFEM;-@^U^gHo6RzkwP>m{5u+~q4K2NC8WK2S zeZ15R%4PJRanU6LPiS;0X3-aQzrDRX`;1_LW`K1^P)=GJRaf~q z&O8b5OXF&FL!b+7gWHRfxZ3)<*+fD@aMGS^SCpv#Yk9hRb1rNRP5K9e66E>- literal 0 HcmV?d00001 diff --git a/apps/block_scout_web/assets/static/images/icons/etherscan@2x.png b/apps/block_scout_web/assets/static/images/icons/etherscan@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a99bffb0d1f078c7a96f7953f5a7f5181bb44adf GIT binary patch literal 3489 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 literal 0 HcmV?d00001 From 8652b11de8b0ca9848aaa499f66471aabfafe272 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 11:17:36 +0300 Subject: [PATCH 2/6] Update _verify_other_explorers.html.eex --- .../address/_verify_other_explorers.html.eex | 122 +++++++++++++----- 1 file changed, 91 insertions(+), 31 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex index 542bdf74c3..cc68e581fc 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex @@ -1,37 +1,97 @@
-

- Verify with other explorers -

-
+ +
+

Verify with other Explorers:

-
- -
-
- - <%= link( - address_link_to_other_explorer("https://blockchair.com/ethereum/address/", @address, false), - to: address_link_to_other_explorer("https://blockchair.com/ethereum/address/", @address ,true) - ) %> - -
+ + +
+

Etherscan.io

+
https://blockchair.com/ethereum/address/0x7c720f9b5bf7af340457e908555fecbd9db1f6da
+
+ + + +
+

Blockchair.com

+
https://blockchair.com/ethereum/address/0x7c720f9b5bf7af340457e908555fecbd9db1f6da
+
+ + + +
+

Etherchain.org

+
https://blockchair.com/ethereum/address/0x7c720f9b5bf7af340457e908555fecbd9db1f6da
+
+ + + + + +
-
-
- -
-
- - <%= link( - address_link_to_other_explorer("https://www.etherchain.org/account/", @address, false), - to: address_link_to_other_explorer("https://www.etherchain.org/account/", @address, true) - ) %> - +
+ + -
\ No newline at end of file + +
From d307a9bbfece44279f54a616aba19f459cfc0e76 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 11:18:01 +0300 Subject: [PATCH 3/6] Update _verify_other_explorers.scss --- .../components/_verify_other_explorers.scss | 158 +++++++++++++++++- 1 file changed, 156 insertions(+), 2 deletions(-) diff --git a/apps/block_scout_web/assets/css/components/_verify_other_explorers.scss b/apps/block_scout_web/assets/css/components/_verify_other_explorers.scss index 36d7ae145c..84f4356e3b 100644 --- a/apps/block_scout_web/assets/css/components/_verify_other_explorers.scss +++ b/apps/block_scout_web/assets/css/components/_verify_other_explorers.scss @@ -1,33 +1,187 @@ +.verify-other-explorers { + display: flex; + margin-top: 26px; + flex-direction: column; + flex-wrap: wrap; + @media (min-width: 768px) { + flex-direction: row; + align-items: center; + justify-content: space-between; + } + @media (min-width: 1200px) { + flex-wrap: nowrap; + } + h2 { + color: #a3a9b5; + font-size: 12px; + font-weight: 400; + line-height: 1.25; + display: inline-flex; + margin-bottom: 12px; + @media (min-width: 1200px) { + margin-right: 10px; + margin-bottom: 0; + } + } +} + +.verify-other-explorers-row { + display: flex; + flex-direction: column; + flex-grow: 2; + @media (min-width: 768px) { + flex-direction: row; + } +} + +.verify-other-explorers-elem { + display: inline-flex; + border: 1px solid #e2e5ec; + border-radius: 2px; + flex-grow: 2; + @media (min-width: 768px) { + margin-top: 0; + } + @media (min-width: 1200px) { + min-width: 145px; + } + & + .verify-other-explorers-elem { + margin-top: 10px; + @media (min-width: 768px) { + margin-top: 0; + margin-left: 10px; + } + } + .exp-logo { + min-width: 34px; + border-right: 1px solid #e2e5ec; + background-repeat: no-repeat; + background-position: center; + &.etherscan { + @include image-2x('/images/icons/etherscan@2x.png', 15px, 16px); + background-image: url("/images/icons/etherscan.png"); + background-size: 15px 16px; + } + &.blockchair { + @include image-2x('/images/icons/blockchair@2x.png', 10px, 16px); + background-image: url("/images/icons/blockchair.png"); + background-size: 10px 16px; + } + &.etherchain { + @include image-2x('/images/icons/etherchain@2x.png', 16px, 16px); + background-image: url("/images/icons/etherchain.png"); + background-size: 16px 16px; + } + } + .exp-content { + padding: 6px 9px 4px 9px; + h3, div { + font-size: 10px; + line-height: 1; + } + h3 { + color: #333; + font-weight: 400; + margin-bottom: 0; + margin-bottom: 1px; + } + div { + color: #49a2ee; + display: block; + line-height: 1; + text-overflow: ellipsis; + overflow: hidden; + width: 170px; + white-space: nowrap; + @media (min-width: 576px) { + width: 398px; + } + @media (min-width: 768px) { + width: 130px; + } + @media (min-width: 992px) { + width: 90px; + } + @media (min-width: 1200px) { + width: 93px; + } + } + } +} + +.verify-other-explorers-more { + min-width: 34px; + height: 34px; + display: inline-flex; + align-items: center; + justify-content: center; + border: 1px solid $secondary; + border-radius: 2px; + margin-top: 10px; + transition: .1s ease-in; + @media (min-width: 768px) { + margin-left: 10px; + margin-top: 0; + } + svg path { + fill: $secondary; + } + &:hover { + background-color: $secondary; + svg path { + fill: #fff; + } + } +} + +.verify-other-explorers-dialog { + max-width: 450px; +} + .verify-other-explorers-table { display: table; } -.verify-other-explorers-row { + +.verify-other-explorers-modal-row { display: table-row; height: 29px; } + .verify-other-explorers-cell { display: table-cell; &.left { min-width: 120px; } } + .link { background-image: url("/images/icons/link.svg"); background-repeat: no-repeat; padding-left: 15px; background-size: 12px 12px; } + +.etherscan-logo { + @include image-2x('/images/icons/etherscan@2x.png', 15px, 16px); + background-image: url("/images/icons/etherscan.png"); + background-repeat: no-repeat; + padding-left: 25px; + background-size: 15px 16px; +} + .blockchair-logo { @include image-2x('/images/icons/blockchair@2x.png', 10px, 16px); background-image: url("/images/icons/blockchair.png"); background-repeat: no-repeat; padding-left: 25px; background-size: 10px 16px; + background-position: left 3px center; } + .etherchain-logo { @include image-2x('/images/icons/etherchain@2x.png', 16px, 16px); background-image: url("/images/icons/etherchain.png"); background-repeat: no-repeat; padding-left: 25px; background-size: 16px 16px; -} \ No newline at end of file +} From 7ba513cd403d9845b2ac486abb50c9aea5cd3b3e Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 11:24:59 +0300 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14cae576cc..b54a365f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Current ### Features +[#2030](https://github.com/poanetwork/blockscout/pull/2030) - added 'Verify link to other explorers' block and modal dialog - [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk - [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" - [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated From ffce1aba5200370ac22926e7741bc8d5505bf2ec Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 11:25:18 +0300 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b54a365f5a..5bcac0b554 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## Current ### Features -[#2030](https://github.com/poanetwork/blockscout/pull/2030) - added 'Verify link to other explorers' block and modal dialog +- [#2030](https://github.com/poanetwork/blockscout/pull/2030) - added 'Verify link to other explorers' block and modal dialog - [#1963](https://github.com/poanetwork/blockscout/pull/1963), [#1959](https://github.com/poanetwork/blockscout/pull/1959), [#1948](https://github.com/poanetwork/blockscout/pull/1948), [#1936](https://github.com/poanetwork/blockscout/pull/1936), [#1925](https://github.com/poanetwork/blockscout/pull/1925), [#1922](https://github.com/poanetwork/blockscout/pull/1922), [#1903](https://github.com/poanetwork/blockscout/pull/1903), [#1874](https://github.com/poanetwork/blockscout/pull/1874), [#1895](https://github.com/poanetwork/blockscout/pull/1895) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk - [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" - [#1928](https://github.com/poanetwork/blockscout/pull/1928) - pagination styles were updated From 4d29805398962825d30094b05e3ac6571a6a2281 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Mon, 27 May 2019 14:16:29 +0300 Subject: [PATCH 6/6] Update _verify_other_explorers.html.eex --- .../templates/address/_verify_other_explorers.html.eex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex index cc68e581fc..85df676383 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex @@ -32,7 +32,7 @@
-