Merge branch 'master' into vb-ff-css-preload-support

pull/2548/head
Victor Baranov 5 years ago committed by GitHub
commit 1bdcacb9bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 3
      apps/block_scout_web/assets/css/app.scss
  3. 4
      apps/block_scout_web/assets/css/non-critical.scss
  4. 2
      apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex

@ -10,7 +10,9 @@
- [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method - [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method
### Fixes ### Fixes
- [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip
- [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox - [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox
- [#2547](https://github.com/poanetwork/blockscout/pull/2547) - do not show eth value if it's zero on the transaction overview page
- [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search - [#2543](https://github.com/poanetwork/blockscout/pull/2543) - do not hide search input during logs search
- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles - [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles
- [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page - [#2532](https://github.com/poanetwork/blockscout/pull/2532) - don't show empty token transfers on the transaction overview page

@ -99,9 +99,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
@import "components/check"; @import "components/check";
@import "components/stakes_variables"; @import "components/stakes_variables";
@import "components/stakes_table"; @import "components/stakes_table";
@import "components/i_tooltip";
@import "components/check_tooltip";
@import "components/tooltip";
@import "components/form"; @import "components/form";
@import "components/btn_copy"; @import "components/btn_copy";
@import "components/btn_qr"; @import "components/btn_qr";

@ -7,6 +7,10 @@
@import "node_modules/bootstrap/scss/modal"; @import "node_modules/bootstrap/scss/modal";
@import "node_modules/bootstrap/scss/tooltip"; @import "node_modules/bootstrap/scss/tooltip";
@import "components/i_tooltip";
@import "components/check_tooltip";
@import "components/tooltip";
@import "components/qr-code"; @import "components/qr-code";
@import "components/modal_variables"; @import "components/modal_variables";
@import "components/modal"; @import "components/modal";

@ -175,7 +175,7 @@
<!-- Value --> <!-- Value -->
<div class="card card-background-1 flex-grow-1"> <div class="card card-background-1 flex-grow-1">
<div class="card-body card-body-flex-column-space-between"> <div class="card-body card-body-flex-column-space-between">
<%= if @transaction.value.value != 0 do %> <%= if @transaction.value && @transaction.value.value != Decimal.new(0) do %>
<h2 class="card-title balance-card-title"><%= gettext "Ether" %> <%= gettext "Value" %></h2> <h2 class="card-title balance-card-title"><%= gettext "Ether" %> <%= gettext "Value" %></h2>
<div class="text-right"> <div class="text-right">
<h3 class="address-balance-text"> <h3 class="address-balance-text">

Loading…
Cancel
Save