Merge branch 'master' into feature/#2038-new-network-selector

* master:
  Update CHANGELOG.md
  404 page added
  Update _tooltip.scss
  Update CHANGELOG.md
  Update _dropdown.scss
  Update _filter.scss
  Update _tooltip.scss
pull/2263/head
Gabriel Rodriguez Alsina 6 years ago
commit 922f3374ea
  1. 2
      CHANGELOG.md
  2. 3
      apps/block_scout_web/assets/css/components/_dropdown.scss
  3. 2
      apps/block_scout_web/assets/css/components/_filter.scss
  4. 5
      apps/block_scout_web/assets/css/components/_tooltip.scss
  5. BIN
      apps/block_scout_web/assets/static/images/errors-img/etc-page-not-found.png
  6. BIN
      apps/block_scout_web/assets/static/images/errors-img/etc-page-not-found@2x.png
  7. BIN
      apps/block_scout_web/assets/static/images/errors-img/eth-page-not-found.png
  8. BIN
      apps/block_scout_web/assets/static/images/errors-img/eth-page-not-found@2x.png
  9. BIN
      apps/block_scout_web/assets/static/images/errors-img/kovan-page-not-found.png
  10. BIN
      apps/block_scout_web/assets/static/images/errors-img/kovan-page-not-found@2x.png
  11. BIN
      apps/block_scout_web/assets/static/images/errors-img/poa-page-not-found.png
  12. BIN
      apps/block_scout_web/assets/static/images/errors-img/poa-page-not-found@2x.png
  13. BIN
      apps/block_scout_web/assets/static/images/errors-img/rinkeby-page-not-found.png
  14. BIN
      apps/block_scout_web/assets/static/images/errors-img/rinkeby-page-not-found@2x.png
  15. BIN
      apps/block_scout_web/assets/static/images/errors-img/ropsten-page-not-found.png
  16. BIN
      apps/block_scout_web/assets/static/images/errors-img/ropsten-page-not-found@2x.png
  17. BIN
      apps/block_scout_web/assets/static/images/errors-img/rsk-page-not-found.png
  18. BIN
      apps/block_scout_web/assets/static/images/errors-img/rsk-page-not-found@2x.png
  19. BIN
      apps/block_scout_web/assets/static/images/errors-img/sokol-page-not-found.png
  20. BIN
      apps/block_scout_web/assets/static/images/errors-img/sokol-page-not-found@2x.png
  21. BIN
      apps/block_scout_web/assets/static/images/errors-img/xdai-page-not-found.png
  22. BIN
      apps/block_scout_web/assets/static/images/errors-img/xdai-page-not-found@2x.png
  23. 2
      apps/block_scout_web/lib/block_scout_web/templates/block_transaction/404.html.eex
  24. 12
      apps/block_scout_web/lib/block_scout_web/templates/page_not_found/index.html.eex

@ -25,7 +25,7 @@
- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups - [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups
### Fixes ### Fixes
- [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix - [#2082](https://github.com/poanetwork/blockscout/pull/2082) - dropdown styles, tooltip gap fix, 404 page added
- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues - [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues
- [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs. - [#2072](https://github.com/poanetwork/blockscout/pull/2072) - Fixed checkmarks not showing correctly in tabs.
- [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input - [#2066](https://github.com/poanetwork/blockscout/pull/2066) - fixed length of logs search input

@ -5,6 +5,9 @@
box-shadow: $box-shadow; box-shadow: $box-shadow;
padding: 0; padding: 0;
width: 100%; width: 100%;
border-left: 1px solid #e2e5ec;
border-right: 1px solid #e2e5ec;
border-bottom: 1px solid #e2e5ec;
&.right { &.right {
left: auto; left: auto;

@ -1,4 +1,4 @@
.filter { .filter {
min-width: 100%; min-width: 100%;
transform: translate3d(1px, 26px, 0px) !important; transform: translate3d(0, 34px, 0px) !important;
} }

@ -17,3 +17,8 @@ $tooltip-color: #fff !default;
border-bottom-color: $tooltip-background-color; border-bottom-color: $tooltip-background-color;
} }
} }
.bs-tooltip-top { top: -10px !important; }
.bs-tooltip-bottom { top: 10px !important; }
.bs-tooltip-left { left: -10px !important; }
.bs-tooltip-right { left: 10px !important; }

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

@ -1,7 +1,7 @@
<section class="container"> <section class="container">
<div class="block-not-found"> <div class="block-not-found">
<div class="block-not-found-img"> <div class="block-not-found-img">
<img alt="Block Not Found" src="/images/errors-img/eth-block-not-found.png" srcset="/images/eth-block-not-found@2x.png 2x"> <img alt="Block Not Found" src="/images/errors-img/eth-block-not-found.png" srcset="/images/errors-img/eth-block-not-found@2x.png 2x">
</div> </div>
<div class="block-not-found-content"> <div class="block-not-found-content">
<h1 class="card-title error-title"><%= gettext("Block Details") %></h1> <h1 class="card-title error-title"><%= gettext("Block Details") %></h1>

@ -0,0 +1,12 @@
<section class="container">
<div class="block-not-found">
<div class="block-not-found-img">
<img alt="Page Not Found" src="/images/errors-img/poa-page-not-found.png" srcset="/images/errors-img/poa-page-not-found@2x.png 2x">
</div>
<div class="block-not-found-content">
<h1 class="card-title error-title">Lorem Ipsum Dolor</h1>
<p class="error-descr">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua</p>
<a class="error-btn btn-line" href="/">Back Home</a>
</div>
</div>
</section>
Loading…
Cancel
Save