From f1b0e373965102ff969a706daa79822570c7229d Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Fri, 31 May 2019 16:51:46 +0300 Subject: [PATCH 1/4] ui issues --- .../assets/css/components/_btn_dropdown_line.scss | 7 +++++++ .../block_scout_web/assets/css/components/_card.scss | 4 +++- .../assets/css/components/_dropdown.scss | 8 ++++---- .../assets/css/components/_modal.scss | 7 ++++++- .../assets/css/theme/_neutral_variables.scss | 12 ++++++++++++ .../templates/layout/_footer.html.eex | 6 +++--- .../templates/layout/_topnav.html.eex | 2 +- 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/apps/block_scout_web/assets/css/components/_btn_dropdown_line.scss b/apps/block_scout_web/assets/css/components/_btn_dropdown_line.scss index 8f89b0700c..f076f14dff 100644 --- a/apps/block_scout_web/assets/css/components/_btn_dropdown_line.scss +++ b/apps/block_scout_web/assets/css/components/_btn_dropdown_line.scss @@ -3,4 +3,11 @@ $btn-dropdown-line-color: $primary !default; .btn-dropdown-line { @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; + } } \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_card.scss b/apps/block_scout_web/assets/css/components/_card.scss index 6e1b6a9725..daaf32fbf9 100644 --- a/apps/block_scout_web/assets/css/components/_card.scss +++ b/apps/block_scout_web/assets/css/components/_card.scss @@ -175,7 +175,9 @@ $card-background-1-text-color: #fff !default; text-align: center; &:hover { - text-decoration: underline; + background-color: rgba($card-tab-active, .1); + color: $card-tab-active; + text-decoration: none; } @include media-breakpoint-down(sm) { diff --git a/apps/block_scout_web/assets/css/components/_dropdown.scss b/apps/block_scout_web/assets/css/components/_dropdown.scss index c93231edbd..998f779ec5 100644 --- a/apps/block_scout_web/assets/css/components/_dropdown.scss +++ b/apps/block_scout_web/assets/css/components/_dropdown.scss @@ -1,6 +1,6 @@ // These styles extend the default Bootstrap styles .dropdown-menu { - border-radius: 8px !important; + border-radius: 0 0 8px 8px !important; border: none; box-shadow: $box-shadow; padding: 0; @@ -32,8 +32,8 @@ } &:first-child { - border-top-left-radius: 8px; - border-top-right-radius: 8px; + border-top-left-radius: 0; + border-top-right-radius: 0; } &:last-child { @@ -46,7 +46,7 @@ &:hover, &:active { padding-left: 10px; - background-color: transparent; + background-color: #fff !important; cursor: default; color: #333; font-weight: 700; diff --git a/apps/block_scout_web/assets/css/components/_modal.scss b/apps/block_scout_web/assets/css/components/_modal.scss index ab2aaab679..4c3cf7f8cf 100644 --- a/apps/block_scout_web/assets/css/components/_modal.scss +++ b/apps/block_scout_web/assets/css/components/_modal.scss @@ -17,12 +17,17 @@ $modal-gray-background: #f6f7f9 !default; padding: #{$modal-vertical-padding} #{$modal-horizontal-padding}; } -.close.close-modal { +.close.close-modal{ left: auto; opacity: 1; position: absolute; right: -35px; top: -35px; + outline: none !important; +} + +.close { + outline: none !important; } .modal-body { diff --git a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss index ac5145fc64..c2232fd0a8 100644 --- a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss @@ -57,3 +57,15 @@ $btn-qr-color: $primary; // btn qr-code // card $card-background-1: $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; + } + } +} diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex index b03b9f964f..ed22191b1f 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_footer.html.eex @@ -16,13 +16,13 @@

<%= gettext("Blockscout is a tool for inspecting and analyzing EVM based blockchains. Blockchain explorer for Ethereum Networks.") %>

- + - + - +
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 514422bcc8..bcee6a869a 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -92,7 +92,7 @@ <%= for %{url: url, title: title} <- test_nets(dropdown_nets()) do %> <%= title %> <% end %> - Other networks + Other Networks <%= for %{url: url, title: title} <- dropdown_other_nets() do %> <%= title %> <% end %> From e5bfcb2eb210ab32833925a1de3e2d29b3294671 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Fri, 31 May 2019 16:56:52 +0300 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1fa6b40c5..b575f23e29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - [#2012](https://github.com/poanetwork/blockscout/pull/2012) - make all pages pagination async ### Fixes +- [#2077](https://github.com/poanetwork/blockscout/pull/2077) - ui issues - [#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 - [#2043](https://github.com/poanetwork/blockscout/pull/2043) - Fixed modal dialog width for 'verify other explorers' From 86cf50a9f2560729d407839e529291cfe2542314 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Fri, 31 May 2019 17:14:33 +0300 Subject: [PATCH 3/4] Update overview.html.eex --- .../block_scout_web/templates/transaction/overview.html.eex | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex index c323998e3a..7c22762e49 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex @@ -71,18 +71,18 @@
<%= gettext "Block Confirmations" %>
- <%= confirmations(@transaction, block_height: @block_height) %> + <%= confirmations(@transaction, block_height: @block_height) %>
<%= gettext "Nonce" %>
-
<%= @transaction.nonce %>
+
<%= @transaction.nonce %>
<%= gettext "TX Fee" %>
-
+
<%= formatted_fee(@transaction, denomination: :ether) %> <%= if !empty_exchange_rate?(@exchange_rate) do %> From 47a20dcfde2f2939cfac34287d2955c7d338091b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 3 Jun 2019 11:20:56 +0300 Subject: [PATCH 4/4] fix CHANGELOG --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c4a8d1e1e..3627226570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,7 @@ ## Current ### Features -- [#2074](https://github.com/poanetwork/blockscout/pull/2074) - blockscout new logo -- [#2073](https://github.com/poanetwork/blockscout/pull/2073) - blockscout default theme -- [#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) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk +- [#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 - [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue