Skip to content

Commit

Permalink
Merge pull request #2082 from maxgrapps/master
Browse files Browse the repository at this point in the history
Dropdown styles, tooltip gap fix, page 404 added
  • Loading branch information
vbaranov committed Jun 3, 2019
2 parents 95d9041 + d63d5b9 commit 07abad7
Show file tree
Hide file tree
Showing 24 changed files with 23 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups

### 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
- [#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
Expand Down
3 changes: 3 additions & 0 deletions apps/block_scout_web/assets/css/components/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
box-shadow: $box-shadow;
padding: 0;
width: 100%;
border-left: 1px solid #e2e5ec;
border-right: 1px solid #e2e5ec;
border-bottom: 1px solid #e2e5ec;

&.right {
left: auto;
Expand Down
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/css/components/_filter.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.filter {
min-width: 100%;
transform: translate3d(1px, 26px, 0px) !important;
transform: translate3d(0, 34px, 0px) !important;
}
5 changes: 5 additions & 0 deletions apps/block_scout_web/assets/css/components/_tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ $tooltip-color: #fff !default;
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; }
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section class="container">
<div class="block-not-found">
<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 class="block-not-found-content">
<h1 class="card-title error-title"><%= gettext("Block Details") %></h1>
Expand Down
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 07abad7

Please sign in to comment.