diff --git a/CHANGELOG.md b/CHANGELOG.md index b086e9d8dd..d991f32f29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,22 @@ ## Current ### Features + +### Fixes +- [#2103](https://github.com/poanetwork/blockscout/pull/2103) - ui issues for all themes +- [#2090](https://github.com/poanetwork/blockscout/pull/2090) - updated some ETC theme colors +- [#2096](https://github.com/poanetwork/blockscout/pull/2096) - RSK theme fixes +- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec + +### Chore + +## 2.0.0-beta + +### Features +- [#2091](https://github.com/poanetwork/blockscout/pull/2091) - Added "Question" modal. +- [#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 - [#1726](https://github.com/poanetwork/blockscout/pull/2071) - Updated styles for the new smart contract page. - [#2081](https://github.com/poanetwork/blockscout/pull/2081) - Tooltip for 'more' button, explorers logos added -- [#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 @@ -24,6 +37,8 @@ - [#2064](https://github.com/poanetwork/blockscout/pull/2064) - feat: add fields to tx apis, small cleanups ### Fixes +- [#2099](https://github.com/poanetwork/blockscout/pull/2099) - logs search input width +- [#2098](https://github.com/poanetwork/blockscout/pull/2098) - nav dropdown issue, logo size issue - [#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. @@ -57,7 +72,8 @@ - [#2014](https://github.com/poanetwork/blockscout/pull/2014) - fix: use better queries for listLogs endpoint - [#2027](https://github.com/poanetwork/blockscout/pull/2027) - fix: `BlocksTransactionsMismatch` ignoring blocks without transactions - [#2070](https://github.com/poanetwork/blockscout/pull/2070) - reduce `max_concurrency` of `BlocksTransactionsMismatch` fetcher -- [#2093](https://github.com/poanetwork/blockscout/pull/2093) - detect token transfer type for deprecated erc721 spec +- [#2083](https://github.com/poanetwork/blockscout/pull/2083) - allow total_difficuly to be nil +- [#2086](https://github.com/poanetwork/blockscout/pull/2086) - fix geth's staticcall without output ### Chore diff --git a/apps/block_scout_web/assets/css/_mixins.scss b/apps/block_scout_web/assets/css/_mixins.scss index a5c3836095..9b00a92e38 100644 --- a/apps/block_scout_web/assets/css/_mixins.scss +++ b/apps/block_scout_web/assets/css/_mixins.scss @@ -73,6 +73,7 @@ } @mixin btn-full($bg-color: $primary, $text-color: #fff) { + -webkit-appearance: none !important; align-items: center; background-color: $bg-color; border-radius: 2px; @@ -121,6 +122,7 @@ } @mixin btn-line($bg-color: #fff, $text-color: $secondary) { + -webkit-appearance: none !important; align-items: center; background-color: $bg-color; border-radius: 2px; diff --git a/apps/block_scout_web/assets/css/components/_address-overview.scss b/apps/block_scout_web/assets/css/components/_address-overview.scss index a366688cd9..a936aec99f 100644 --- a/apps/block_scout_web/assets/css/components/_address-overview.scss +++ b/apps/block_scout_web/assets/css/components/_address-overview.scss @@ -70,6 +70,7 @@ font-weight: 200; line-height: 1.2; margin: 0 0 12px; + font-weight: 400; small { font-size: 11px; 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 f076f14dff..ab83628c57 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 @@ -1,13 +1,16 @@ $btn-dropdown-line-bg: #fff !default; -$btn-dropdown-line-color: $primary !default; +$btn-dropdown-line-color: #e2e5ec !default; +$btn-dropdown-line-font: #333; .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 + @include btn-line($btn-dropdown-line-bg, $btn-dropdown-line-color); + border-color: $btn-dropdown-line-color; + color: $btn-dropdown-line-font; + outline: none !important; + + &:hover { + background-color: $btn-dropdown-line-color; + border-color: $btn-dropdown-line-color; + color: $btn-dropdown-line-font; + } +} diff --git a/apps/block_scout_web/assets/css/components/_btn_qr.scss b/apps/block_scout_web/assets/css/components/_btn_qr.scss index 0f8fbc54f3..856f14ef30 100644 --- a/apps/block_scout_web/assets/css/components/_btn_qr.scss +++ b/apps/block_scout_web/assets/css/components/_btn_qr.scss @@ -3,4 +3,5 @@ $btn-qr-dimensions: 31px !default; .btn-qr-icon { @include square-icon-button($btn-qr-color, $btn-qr-dimensions); + transition: $transition-base !important; } diff --git a/apps/block_scout_web/assets/css/components/_card.scss b/apps/block_scout_web/assets/css/components/_card.scss index 8b4f1a423c..07a7961efe 100644 --- a/apps/block_scout_web/assets/css/components/_card.scss +++ b/apps/block_scout_web/assets/css/components/_card.scss @@ -176,6 +176,7 @@ $card-tab-icon-color-active: #20b760 !default; height: 70px; padding: 0 25px; text-align: center; + transition: $transition-base; &:hover { background-color: rgba($card-tab-active, .1); diff --git a/apps/block_scout_web/assets/css/components/_dropdown.scss b/apps/block_scout_web/assets/css/components/_dropdown.scss index f0a7e33661..a45f9afa16 100644 --- a/apps/block_scout_web/assets/css/components/_dropdown.scss +++ b/apps/block_scout_web/assets/css/components/_dropdown.scss @@ -1,13 +1,17 @@ +$dropdown-menu-item-color: #333 !default; +$dropdown-menu-item-hover-color: $primary !default; +$dropdown-menu-item-hover-background: rgba($primary, .1) !default; + // These styles extend the default Bootstrap styles .dropdown-menu { + border-bottom: 1px solid #e2e5ec; + border-left: 1px solid #e2e5ec; border-radius: 0 0 8px 8px !important; - border: none; + border-right: 1px solid #e2e5ec; + border-top: none; 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; @@ -27,11 +31,18 @@ } .dropdown-item { + color: $dropdown-menu-item-color; font-size: 12px; padding: 10px 20px; + transition: $transition-base; - &:hover { - color: #fff; + & { + &.active, + &:hover, + &:focus { + background-color: $dropdown-menu-item-hover-background !important; + color: $dropdown-menu-item-hover-color; + } } &:first-child { @@ -55,10 +66,6 @@ font-weight: 700; } } - - &.active { - background-color: $secondary; - } &.division { border-top: 1px solid $base-border-color; diff --git a/apps/block_scout_web/assets/css/components/_footer.scss b/apps/block_scout_web/assets/css/components/_footer.scss index 169f6608dc..a27f932078 100644 --- a/apps/block_scout_web/assets/css/components/_footer.scss +++ b/apps/block_scout_web/assets/css/components/_footer.scss @@ -4,7 +4,7 @@ $footer-text-color: rgba(#fff, 0.7) !default; $footer-link-color: $footer-text-color !default; $footer-item-disc-color: $primary !default; $footer-social-icon-color: $footer-text-color !default; -$footer-logo-height: 2rem !default; +$footer-logo-height: 18px !default; $footer-logo-width: auto !default; .footer { @@ -26,7 +26,7 @@ $footer-logo-width: auto !default; } .footer-logo { - height: $footer-logo-height; + max-height: $footer-logo-height; width: $footer-logo-width; } @@ -46,9 +46,10 @@ $footer-logo-width: auto !default; font-size: 22px; margin-right: 15px; text-decoration: none; + transition: $transition-base; &:hover { - color: $footer-social-icon-color; + color: #fff; } &:last-child { @@ -91,6 +92,14 @@ $footer-logo-width: auto !default; line-height: 2.5; padding: 0; + a { + transition: $transition-base; + &:hover { + text-decoration: none; + color: #fff; + } + } + &::before { background-color: $footer-item-disc-color; border-radius: 50%; diff --git a/apps/block_scout_web/assets/css/components/_log-search.scss b/apps/block_scout_web/assets/css/components/_log-search.scss index a31de73262..f1c6d145cc 100644 --- a/apps/block_scout_web/assets/css/components/_log-search.scss +++ b/apps/block_scout_web/assets/css/components/_log-search.scss @@ -12,8 +12,10 @@ .logs-search { display: flex; position: relative; + width: 52%; @media (max-width: 599px) { margin-bottom: 30px; + width: 100%; } } @@ -57,8 +59,8 @@ transition: .1s ease-in; position: absolute; top: 0; - left: 136px; + right: 59px; &:hover { color: #333; } -} \ No newline at end of file +} diff --git a/apps/block_scout_web/assets/css/components/_modal_status.scss b/apps/block_scout_web/assets/css/components/_modal_status.scss index 9c32b05c72..92856250fc 100644 --- a/apps/block_scout_web/assets/css/components/_modal_status.scss +++ b/apps/block_scout_web/assets/css/components/_modal_status.scss @@ -1,6 +1,7 @@ $modal-status-graph-error: #ff0d51 !default; $modal-status-graph-warning: #ff8502 !default; $modal-status-graph-success: $primary !default; +$modal-status-graph-question: #329ae9 !default; .modal-status { max-width: 100%; @@ -32,6 +33,10 @@ $modal-status-graph-success: $primary !default; background-color: $modal-status-graph-success; } + &-question { + background-color: $modal-status-graph-question; + } + svg { margin-top: 15px; } @@ -62,3 +67,18 @@ $modal-status-graph-success: $primary !default; margin: 0 0 25px; text-align: center; } + +.modal-status-button-wrapper { + display: flex; + justify-content: space-between; + width: 100%; + + .btn-line { + flex-grow: 1; + margin-right: 20px; + + &:last-child { + margin-right: 0; + } + } +} \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_navbar.scss b/apps/block_scout_web/assets/css/components/_navbar.scss index 0999ef327c..f98704f957 100644 --- a/apps/block_scout_web/assets/css/components/_navbar.scss +++ b/apps/block_scout_web/assets/css/components/_navbar.scss @@ -1,6 +1,6 @@ // Default variables $header-background-color: #fff !default; -$header-links-color: #a3a9b5 !default; +$header-links-color: #828ba0 !default; $header-links-color-active: #333 !default; $header-icon-color: $header-links-color !default; $header-icon-color-hover: #333 !default; @@ -10,7 +10,7 @@ $header-textfield-text-color: $header-links-color !default; $header-textfield-background-color: #f5f6fa !default; $header-textfield-magnifier-color: $header-links-color !default; $header-link-horizontal-padding: 0.71rem; -$navbar-logo-height: 1.5em !default; +$navbar-logo-height: 18px !default; $navbar-logo-width: auto !default; .navbar.navbar-primary { @@ -30,6 +30,7 @@ $navbar-logo-width: auto !default; display: flex; font-size: 14px; position: relative; + transition: $transition-base; &:before { background-color: $header-icon-border-color-hover; @@ -77,12 +78,16 @@ $navbar-logo-width: auto !default; path { fill: $header-icon-color; + transition: $transition-base; } } } .nav-item-networks { margin-left: auto; + .nav-link:before { + display: none; + } } } @@ -208,7 +213,7 @@ $navbar-logo-width: auto !default; } .navbar-logo { - height: $navbar-logo-height; + max-height: $navbar-logo-height; width: $navbar-logo-width; } diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss index 71cabbd1b3..d5658647c5 100644 --- a/apps/block_scout_web/assets/css/components/_tile.scss +++ b/apps/block_scout_web/assets/css/components/_tile.scss @@ -14,6 +14,8 @@ $tile-type-progress-bar-color: $primary !default; $tile-status-error-reason: #ff7986 !default; $tile-status-awaiting-internal-transactions: $warning !default; $tile-padding: 1rem; +$tile-title-color: #333 !default; +$tile-body-a-color: #5959d8 !default; @mixin generate-tile-block($prefix, $color, $label-color: false) { &#{ $prefix } { @@ -23,8 +25,7 @@ $tile-padding: 1rem; a { @if ($label-color) { color: $label-color; - } - @else { + } @else { color: $color; } } @@ -33,19 +34,13 @@ $tile-padding: 1rem; .tile-label { @if ($label-color) { color: $label-color; - } - @else { + } @else { color: $color; } } .tile-status-label { - @if ($label-color) { - color: $label-color; - } - @else { - color: $color; - } + color: inherit; } .tile-transaction-type-block { @@ -60,20 +55,6 @@ $tile-padding: 1rem; /*********************************************************************/ -.tile-title { - color: #333; - font-size: 12px; - - &-hash { - font-weight: 300; - } - - &-lg { - color: $body-color; - font-size: 16px; - } -} - .tile-label { font-size: 12px; font-weight: 700; @@ -154,7 +135,6 @@ $tile-padding: 1rem; } .tile-function-response { - span.function-response-item { display: block; margin-left: 1rem; @@ -167,7 +147,6 @@ $tile-padding: 1rem; p { margin: 0; } - } .tile-image { @@ -176,6 +155,29 @@ $tile-padding: 1rem; } .tile { + span[data-address-hash] { + color: $tile-body-a-color; + } + + .tile-body { + a { + color: $tile-body-a-color; + } + } + + .tile-title { + color: $tile-title-color; + font-size: 12px; + + &-hash { + font-weight: 300; + } + + &-lg { + color: $body-color; + font-size: 16px; + } + } border-radius: 4px; border: 1px solid $border-color; color: $text-muted; @@ -184,20 +186,57 @@ $tile-padding: 1rem; line-height: 1.4rem; padding: $tile-padding; - @include generate-tile-block('.tile-type-block', $tile-type-block-color, darken($tile-type-block-color, 20%)); - @include generate-tile-block('.tile-type-uncle', $tile-type-uncle-color); - @include generate-tile-block('.tile-type-reorg', $tile-type-reorg-color); - @include generate-tile-block('.tile-type-emission-reward', $tile-type-emission-reward-color); - @include generate-tile-block('.tile-type-transaction', $tile-type-transaction-color); - @include generate-tile-block('.tile-type-contract-call', $tile-type-contract-call-color); - @include generate-tile-block('.tile-type-contract-creation', $tile-type-contract-creation-color); - @include generate-tile-block('.tile-type-token-transfer', $tile-type-token-transfer-color); - @include generate-tile-block('.tile-type-unique-token', $tile-type-unique-token-color); - @include generate-tile-block('.tile-type-unique-token-image', $tile-type-unique-token-image-color); - @include generate-tile-block('.tile-type-internal-transaction', $tile-type-internal-transaction-color); - @include generate-tile-block('.tile-type-api-documentation', $tile-type-api-documentation-color); - @include generate-tile-block('[class*="status--error"]', $tile-status-error-reason); - @include generate-tile-block('.tile-status--awaiting-internal-transactions', $tile-status-awaiting-internal-transactions); + @include generate-tile-block( + ".tile-type-block", + $tile-type-block-color, + darken($tile-type-block-color, 20%) + ); + @include generate-tile-block(".tile-type-uncle", $tile-type-uncle-color); + @include generate-tile-block(".tile-type-reorg", $tile-type-reorg-color); + @include generate-tile-block( + ".tile-type-emission-reward", + $tile-type-emission-reward-color + ); + @include generate-tile-block( + ".tile-type-transaction", + $tile-type-transaction-color + ); + @include generate-tile-block( + ".tile-type-contract-call", + $tile-type-contract-call-color + ); + @include generate-tile-block( + ".tile-type-contract-creation", + $tile-type-contract-creation-color + ); + @include generate-tile-block( + ".tile-type-token-transfer", + $tile-type-token-transfer-color + ); + @include generate-tile-block( + ".tile-type-unique-token", + $tile-type-unique-token-color + ); + @include generate-tile-block( + ".tile-type-unique-token-image", + $tile-type-unique-token-image-color + ); + @include generate-tile-block( + ".tile-type-internal-transaction", + $tile-type-internal-transaction-color + ); + @include generate-tile-block( + ".tile-type-api-documentation", + $tile-type-api-documentation-color + ); + @include generate-tile-block( + '[class*="status--error"]', + $tile-status-error-reason + ); + @include generate-tile-block( + ".tile-status--awaiting-internal-transactions", + $tile-status-awaiting-internal-transactions + ); &.n-p { padding: 0; @@ -273,4 +312,4 @@ $tile-padding: 1rem; border-radius: 2px; } } -} \ No newline at end of file +} diff --git a/apps/block_scout_web/assets/css/theme/_base_variables.scss b/apps/block_scout_web/assets/css/theme/_base_variables.scss index 0d428a7194..5b1b55b7d5 100644 --- a/apps/block_scout_web/assets/css/theme/_base_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_base_variables.scss @@ -3,13 +3,17 @@ // Variables should follow the `$component-state-property-size` formula for // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs. +$dashboard-line-color-price: #8286a9 !default; +$base-border-color: #e2e5ec !default; +$common-container-margin: 50px !default; + // stylelint-disable $white: #fff !default; $gray-100: #f8f9fa !default; $gray-200: #e9ecef !default; $gray-300: #dee2e6 !default; $gray-400: #ced4da !default; -$gray-500: #adb5bd !default; +$gray-500: #828ba0 !default; $gray-600: #cdcdcc !default; $gray-700: #495057 !default; $gray-800: #343a40 !default; diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss index 490ae2376b..fadc5f2720 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss @@ -9,29 +9,21 @@ $footer-background-color: $primary; $footer-title-color: #fff; $footer-text-color: $additional-font; $footer-item-disc-color: $tertiary; -.footer-logo { filter: brightness(0) invert(1); } +$footer-social-icon-color: #5959d8; // dashboard -$dashboard-line-color-price: $tertiary; // price left border - +$dashboard-line-color-price: $secondary; +$dashboard-line-color-market: $tertiary; +$dashboard-banner-gradient-start: #1b1b39; +$dashboard-banner-gradient-end: #27275f; $dashboard-banner-chart-legend-value-color: $additional-font; // chart labels - $dashboard-stats-item-value-color: $additional-font; // stat values - $dashboard-stats-item-border-color: $secondary; // stat border - -$dashboard-banner-gradient-start: $primary; // gradient begin - -$dashboard-banner-gradient-end: lighten($primary, 5); // gradient end - $dashboard-banner-network-plain-container-background-color: #2d2d69; // stats bg - // navigation -.navbar { box-shadow: 0px 0px 30px 0px rgba(21, 53, 80, 0.12); } // header shadow $header-icon-border-color-hover: $tertiary; // top border on hover $header-icon-color-hover: $tertiary; // nav icon on hover -.dropdown-item:hover, .dropdown-item:focus { background-color: $tertiary !important; } // dropdown item on hover // buttons $btn-line-bg: #fff; // button bg @@ -39,12 +31,31 @@ $btn-line-color: #27275e; // button border and font color && hover bg color $btn-copy-color: #27275e; // btn copy $btn-qr-color: #27275e; // btn qr-code -//links & tile -.tile a { color: $tertiary !important; } // links color for badges -.tile-type-block { - border-left: 4px solid #27275e; -} // tab active bg - // card $card-background-1: $tertiary; $card-tab-active: $tertiary; + +// ETC theme's idiosyncrasies +.layout-container { + .navbar { + box-shadow: 0 0 30px 0 rgba(21, 53, 80, 0.12); + } + + .dropdown-item:hover, + .dropdown-item.active, + .dropdown-item:focus { + background-color: $tertiary; + } + + .dashboard-banner-container { + background-image: linear-gradient( + to bottom, + $dashboard-banner-gradient-start, + $dashboard-banner-gradient-end + ); + } + + .footer-logo { + filter: brightness(0) invert(1); + } +} 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 c2232fd0a8..40878c5402 100644 --- a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss @@ -1,12 +1,3 @@ -// $primary: #262d62; -// $secondary: #687bf6; -// $tertiary: #687bf6; - -$dashboard-line-color-price: #8286a9 !default; - -$base-border-color: #e2e5ec !default; -$common-container-margin: 50px !default; - // general $primary: #5c34a2; $secondary: #87e1a9; diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss index c357f0f571..efd2afe2f5 100644 --- a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss @@ -4,47 +4,57 @@ $secondary: #27ac8d; $tertiary: #e39a54; $additional-font: #a1ded1; +$tile-body-a-color: $secondary; +$tile-type-block-color: $secondary; + +$tile-type-progress-bar-color: $secondary; + // footer $footer-background-color: $primary; $footer-title-color: #fff; $footer-text-color: $additional-font; $footer-item-disc-color: $secondary; -.footer-logo { filter: brightness(0) invert(1); } +$footer-social-icon-color: $secondary; // dashboard $dashboard-line-color-price: $tertiary; // price left border - $dashboard-banner-chart-legend-value-color: $additional-font; // chart labels - $dashboard-stats-item-value-color: $additional-font; // stat values - $dashboard-stats-item-border-color: $secondary; // stat border - $dashboard-banner-gradient-start: $primary; // gradient begin - -$dashboard-banner-gradient-end: lighten($primary, 5); // gradient end - +$dashboard-banner-gradient-end: #193039; // gradient end $dashboard-banner-network-plain-container-background-color: #1a323b; // stats bg - // navigation -.navbar { box-shadow: 0px 0px 30px 0px rgba(21, 53, 80, 0.12); } // header shadow $header-icon-border-color-hover: $secondary; // top border on hover $header-icon-color-hover: $secondary; // nav icon on hover -.dropdown-item:hover, .dropdown-item:focus { background-color: $secondary !important; } // dropdown item on hover // buttons $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code - -//links & tile -.tile a { color: $secondary !important; } // links color for badges -.tile-type-block { - border-left: 4px solid $secondary; -} // tab active bg +$btn-dropdown-line-color: $secondary; // card $card-background-1: $secondary; -$card-tab-active: $secondary; \ No newline at end of file +$card-tab-active: $secondary; + +// ETC theme's idiosyncrasies +.layout-container { + .navbar { + box-shadow: 0 0 30px 0 rgba(21, 53, 80, 0.12); + } + + .dashboard-banner-container { + background-image: linear-gradient( + to bottom, + $dashboard-banner-gradient-start, + $dashboard-banner-gradient-end + ); + } + + .footer-logo { + filter: brightness(0) invert(1); + } + } diff --git a/apps/block_scout_web/assets/static/images/blockscout_logo.svg b/apps/block_scout_web/assets/static/images/blockscout_logo.svg index 2abda8ba4b..8537a316a1 100644 --- a/apps/block_scout_web/assets/static/images/blockscout_logo.svg +++ b/apps/block_scout_web/assets/static/images/blockscout_logo.svg @@ -1,4 +1,4 @@ - + @@ -61,5 +61,5 @@ - + diff --git a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex index 272942fea0..23985be4f6 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/block/overview.html.eex @@ -57,7 +57,7 @@
<%= gettext "Difficulty" %>
- <%= @block.difficulty |> Cldr.Number.to_string! %> + <%= @block.difficulty |> Cldr.Number.to_string! %>
@@ -65,13 +65,13 @@
<%= gettext "Total Difficulty" %>
-
<%= @block.total_difficulty |> Cldr.Number.to_string! %>
+
<%= @block.total_difficulty |> Cldr.Number.to_string! %>
<%= gettext "Nonce" %>
-
<%= to_string(@block.nonce) %>
+
<%= to_string(@block.nonce) %>
<%= if length(@block.uncle_relations) > 0 do %> @@ -97,14 +97,14 @@
<%= gettext "Gas Used" %>
- <%= @block.gas_used |> Cldr.Number.to_string! %> + <%= @block.gas_used |> Cldr.Number.to_string! %> (<%= (Decimal.to_integer(@block.gas_used) / Decimal.to_integer(@block.gas_limit)) |> Cldr.Number.to_string!(format: "#.#%") %>)
<%= gettext "Gas Limit" %>
- <%= Cldr.Number.to_string!(@block.gas_limit) %> + <%= Cldr.Number.to_string!(@block.gas_limit) %>
<% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_icon_question_modal.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_icon_question_modal.html.eex new file mode 100644 index 0000000000..14c50899c0 --- /dev/null +++ b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_icon_question_modal.html.eex @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_modal_status.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_modal_status.html.eex index c3bd4752e1..f6328b8f1b 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/common_components/_modal_status.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/common_components/_modal_status.html.eex @@ -17,6 +17,11 @@ render BlockScoutWeb.CommonComponentsView, "_icon_warning_modal.html" end %> + <%= + if @status == "question" do + render BlockScoutWeb.CommonComponentsView, "_icon_question_modal.html" + end + %> <%= render BlockScoutWeb.CommonComponentsView, "_modal_close_button.html" %>
@@ -26,9 +31,20 @@ <%= if assigns[:text] do %>

<%= @text %>

<% end %> - +
+ <%= if @status !== "question" do %> + + <% else %> + + + <% end %> +
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 ed22191b1f..1058654d49 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 @@ -84,4 +84,4 @@ <% end %> - + \ No newline at end of file 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 bcee6a869a..f48e78c390 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 @@ -77,7 +77,7 @@
  • -