Merge branch 'master' into master

pull/2082/head
Victor Baranov 5 years ago committed by GitHub
commit d63d5b933e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 67
      apps/block_scout_web/assets/css/components/_verify_other_explorers.scss
  3. 4
      apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorer_modal.html.eex
  4. 3
      apps/block_scout_web/lib/block_scout_web/templates/address/_verify_other_explorers.html.eex

@ -1,6 +1,7 @@
## Current
### Features
- [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added
- [#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), [#2031](https://github.com/poanetwork/blockscout/pull/2031), [#2073](https://github.com/poanetwork/blockscout/pull/2073), [#2074](https://github.com/poanetwork/blockscout/pull/2074), - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk and default theme
- [#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

@ -121,6 +121,7 @@
border-radius: 2px;
margin-top: 10px;
transition: .1s ease-in;
position: relative;
@media (min-width: 768px) {
margin-left: 10px;
margin-top: 0;
@ -134,6 +135,13 @@
fill: #fff;
}
}
span {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
}
.verify-other-explorers-dialog {
@ -147,6 +155,40 @@
.verify-other-explorers-modal-row {
display: table-row;
height: 29px;
&:first-child {
.verify-other-explorers-cell.left {
.exp-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;
}
}
}
&:nth-child(2) {
.verify-other-explorers-cell.left {
.exp-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;
}
}
}
&:nth-child(3) {
.verify-other-explorers-cell.left {
.exp-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;
}
}
}
}
.verify-other-explorers-cell {
@ -162,28 +204,3 @@
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;
}

@ -1,6 +1,6 @@
<div class="verify-other-explorers-modal-row">
<div class="verify-other-explorers-cell">
<span class="etherscan-logo">
<div class="verify-other-explorers-cell left">
<span class="exp-logo">
<%= @header %>
</span>
</div>

@ -7,8 +7,9 @@
<%= render "_verify_other_explorer.html", hash: @hash, type: @type, header: "Blockchair.com", class: "blockchair", address_link: "https://blockchair.com/ethereum/address/", tx_link: "https://blockchair.com/ethereum/transaction/" %>
<%= render "_verify_other_explorer.html", hash: @hash, type: @type, header: "Etherchain.org", class: "etherchain", address_link: "https://www.etherchain.org/account/", tx_link: "https://www.etherchain.org/tx/" %>
<a href="#" class="verify-other-explorers-more" data-toggle="modal" data-target="#explorersModal">
<span data-toggle="tooltip" data-placement="top" data-original-title="Explorers"></span>
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="4">
<path fill="#49A2EE" fill-rule="evenodd" d="M16 4a2 2 0 1 1-.001-3.999A2 2 0 0 1 16 4zM9 4A2 2 0 1 1 8.999.001 2 2 0 0 1 9 4zM2 4A2 2 0 1 1 1.999.001 2 2 0 0 1 2 4z"/>
<path fill="#49A2EE" fill-rule="evenodd" d="M16 4a2 2 0 1 1-.001-3.999A2 2 0 0 1 16 4zM9 4A2 2 0 1 1 8.999.001 2 2 0 0 1 9 4zM2 4A2 2 0 1 1 1.999.001 2 2 0 0 1 2 4z" />
</svg>
</a>
</div>

Loading…
Cancel
Save