Merge pull request #2077 from maxgrapps/master

UI Issues
pull/2086/head
Victor Baranov 6 years ago committed by GitHub
commit 04fc8fe3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 7
      apps/block_scout_web/assets/css/components/_btn_dropdown_line.scss
  3. 4
      apps/block_scout_web/assets/css/components/_card.scss
  4. 8
      apps/block_scout_web/assets/css/components/_dropdown.scss
  5. 5
      apps/block_scout_web/assets/css/components/_modal.scss
  6. 12
      apps/block_scout_web/assets/css/theme/_neutral_variables.scss
  7. 6
      apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex
  8. 2
      apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
  9. 6
      apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex

@ -23,6 +23,7 @@
- [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async - [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async
### Fixes ### Fixes
- [#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
- [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added - [#2056](https://github.com/poanetwork/blockscout/pull/2056) - log search form styles added

@ -3,4 +3,11 @@ $btn-dropdown-line-color: $primary !default;
.btn-dropdown-line { .btn-dropdown-line {
@include btn-line($btn-dropdown-line-bg, $btn-dropdown-line-color); @include btn-line($btn-dropdown-line-bg, $btn-dropdown-line-color);
outline: none !important;
color: #333;
border-color: #e2e5ec;
&:hover {
background-color: transparent;
color: #333;
}
} }

@ -178,7 +178,9 @@ $card-tab-icon-color-active: #20b760 !default;
text-align: center; text-align: center;
&:hover { &:hover {
text-decoration: underline; background-color: rgba($card-tab-active, .1);
color: $card-tab-active;
text-decoration: none;
} }
@include media-breakpoint-down(md) { @include media-breakpoint-down(md) {

@ -1,6 +1,6 @@
// These styles extend the default Bootstrap styles // These styles extend the default Bootstrap styles
.dropdown-menu { .dropdown-menu {
border-radius: 8px !important; border-radius: 0 0 8px 8px !important;
border: none; border: none;
box-shadow: $box-shadow; box-shadow: $box-shadow;
padding: 0; padding: 0;
@ -32,8 +32,8 @@
} }
&:first-child { &:first-child {
border-top-left-radius: 8px; border-top-left-radius: 0;
border-top-right-radius: 8px; border-top-right-radius: 0;
} }
&:last-child { &:last-child {
@ -46,7 +46,7 @@
&:hover, &:hover,
&:active { &:active {
padding-left: 10px; padding-left: 10px;
background-color: transparent; background-color: #fff !important;
cursor: default; cursor: default;
color: #333; color: #333;
font-weight: 700; font-weight: 700;

@ -23,6 +23,11 @@ $modal-gray-background: #f6f7f9 !default;
position: absolute; position: absolute;
right: -35px; right: -35px;
top: -35px; top: -35px;
outline: none !important;
}
.close {
outline: none !important;
} }
.modal-body { .modal-body {

@ -57,3 +57,15 @@ $btn-qr-color: $primary; // btn qr-code
// card // card
$card-background-1: $primary; $card-background-1: $primary;
$card-tab-active: $primary; $card-tab-active: $primary;
.footer {
.tooltip {
.tooltip-inner {
background-color: darken($footer-background-color, 10) !important;
}
.arrow::before {
border-top-color: darken($footer-background-color, 10) !important;
border-bottom-color: darken($footer-background-color, 10) !important;
}
}
}

@ -16,13 +16,13 @@
<div class="col-md-<%= col_size %>"> <div class="col-md-<%= col_size %>">
<p class="footer-info-text"><%= gettext("Blockscout is a tool for inspecting and analyzing EVM based blockchains. Blockchain explorer for Ethereum Networks.") %></p> <p class="footer-info-text"><%= gettext("Blockscout is a tool for inspecting and analyzing EVM based blockchains. Blockchain explorer for Ethereum Networks.") %></p>
<div class="footer-social-icons"> <div class="footer-social-icons">
<a href="https://github.com/poanetwork/blockscout" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title='<%= gettext("Github") %>'> <a href="https://github.com/poanetwork/blockscout" rel="noreferrer" target="_blank" class="footer-social-icon" title='<%= gettext("Github") %>'>
<i class="fab fa-github"></i> <i class="fab fa-github"></i>
</a> </a>
<a href="https://www.twitter.com/_blockscout/" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title='<%= gettext("Twitter") %>'> <a href="https://www.twitter.com/_blockscout/" rel="noreferrer" target="_blank" class="footer-social-icon" title='<%= gettext("Twitter") %>'>
<i class="fab fa-twitter"></i> <i class="fab fa-twitter"></i>
</a> </a>
<a href="https://t.me/poa_network" rel="noreferrer" target="_blank" class="footer-social-icon" data-toggle="tooltip" data-placement="top" title='<%= gettext("Telegram") %>'> <a href="https://t.me/poa_network" rel="noreferrer" target="_blank" class="footer-social-icon" title='<%= gettext("Telegram") %>'>
<i class="fab fa-telegram-plane"></i> <i class="fab fa-telegram-plane"></i>
</a> </a>
</div> </div>

@ -92,7 +92,7 @@
<%= for %{url: url, title: title} <- test_nets(dropdown_nets()) do %> <%= for %{url: url, title: title} <- test_nets(dropdown_nets()) do %>
<a class="dropdown-item" href="<%= url%>"><%= title %></a> <a class="dropdown-item" href="<%= url%>"><%= title %></a>
<% end %> <% end %>
<a class="dropdown-item header division">Other networks</a> <a class="dropdown-item header division">Other Networks</a>
<%= for %{url: url, title: title} <- dropdown_other_nets() do %> <%= for %{url: url, title: title} <- dropdown_other_nets() do %>
<a class="dropdown-item" href="<%= url%>"><%= title %></a> <a class="dropdown-item" href="<%= url%>"><%= title %></a>
<% end %> <% end %>

@ -71,18 +71,18 @@
<dl class="row"> <dl class="row">
<dt class="col-sm-3 text-muted"><%= gettext "Block Confirmations" %></dt> <dt class="col-sm-3 text-muted"><%= gettext "Block Confirmations" %></dt>
<dd class="col-sm-9"> <dd class="col-sm-9">
<span data-selector="block-confirmations" class="font-weight-bold"><%= confirmations(@transaction, block_height: @block_height) %></span> <span data-selector="block-confirmations"><%= confirmations(@transaction, block_height: @block_height) %></span>
</dd> </dd>
</dl> </dl>
<!-- Nonce --> <!-- Nonce -->
<dl class="row"> <dl class="row">
<dt class="col-sm-3 text-muted"> <%= gettext "Nonce" %> </dt> <dt class="col-sm-3 text-muted"> <%= gettext "Nonce" %> </dt>
<dd class="col-sm-9 font-weight-bold"> <%= @transaction.nonce %> </dd> <dd class="col-sm-9"> <%= @transaction.nonce %> </dd>
</dl> </dl>
<!-- TX Fee --> <!-- TX Fee -->
<dl class="row"> <dl class="row">
<dt class="col-sm-3 text-muted"> <%= gettext "TX Fee" %> </dt> <dt class="col-sm-3 text-muted"> <%= gettext "TX Fee" %> </dt>
<dd class="col-sm-9 font-weight-bold"> <dd class="col-sm-9">
<%= formatted_fee(@transaction, denomination: :ether) %> <%= formatted_fee(@transaction, denomination: :ether) %>
<%= if !empty_exchange_rate?(@exchange_rate) do %> <%= if !empty_exchange_rate?(@exchange_rate) do %>

Loading…
Cancel
Save