Merge pull request #2830 from poanetwork/vb-dai-theme-fix

Fix wrong color of contract icon on xDai chain
pull/2841/head
Victor Baranov 5 years ago committed by GitHub
commit 09b800533d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 59
      apps/block_scout_web/assets/css/theme/_dai_variables.scss
  3. 2
      apps/block_scout_web/assets/static/images/dai_logo.svg
  4. 2
      apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg

@ -6,6 +6,7 @@
- [#2449](https://github.com/poanetwork/blockscout/pull/2449) - add ability to send notification events through postgres notify - [#2449](https://github.com/poanetwork/blockscout/pull/2449) - add ability to send notification events through postgres notify
### Fixes ### Fixes
- [#2830](https://github.com/poanetwork/blockscout/pull/2830) - Fix wrong color of contract icon on xDai chain
- [#2829](https://github.com/poanetwork/blockscout/pull/2829) - Fix for stuck gas limit label and value - [#2829](https://github.com/poanetwork/blockscout/pull/2829) - Fix for stuck gas limit label and value
- [#2800](https://github.com/poanetwork/blockscout/pull/2800) - return not found for not verified contract for token read_contract - [#2800](https://github.com/poanetwork/blockscout/pull/2800) - return not found for not verified contract for token read_contract
- [#2806](https://github.com/poanetwork/blockscout/pull/2806) - Fix blocks fetching on the main page - [#2806](https://github.com/poanetwork/blockscout/pull/2806) - Fix blocks fetching on the main page

@ -1,23 +1,23 @@
// general // general
$primary: #233174; $primary: #17314f;
$secondary: #15f9bb; $secondary: #15bba6;
$tertiary: #5a77ff; $tertiary: #93d7ff;
$additional-font: #fff; $additional-font: #fff;
// footer // footer
$footer-background-color:#202d6a; $footer-background-color: $primary;
$footer-title-color: #fff; $footer-title-color: #fff;
$footer-text-color: #b5c2ff; $footer-text-color: #96bde8;
$footer-item-disc-color: $secondary; $footer-item-disc-color: $secondary;
.footer-logo { filter: brightness(0) invert(1); } .footer-logo { filter: brightness(0) invert(1); }
.footer-social-icon { color: $secondary!important; }
// dashboard // dashboard
$dashboard-line-color-price: $tertiary; // price left border $dashboard-line-color-price: $tertiary; // price left border
$dashboard-line-color-market: $secondary; $dashboard-line-color-market: $secondary;
$dashboard-banner-chart-legend-label-color: $footer-text-color; $dashboard-banner-chart-legend-label-color: $footer-text-color;
$dashboard-stats-item-label-color: #b4c1ff; $dashboard-stats-item-label-color: $footer-text-color;
$dashboard-banner-chart-legend-value-color: #fff; // chart labels $dashboard-banner-chart-legend-value-color: #fff; // chart labels
$dashboard-stats-item-value-color: #fff; // stat values $dashboard-stats-item-value-color: #fff; // stat values
@ -25,11 +25,9 @@ $dashboard-stats-item-border-color: $secondary; // stat border
$dashboard-banner-gradient-start: $primary; // gradient begin $dashboard-banner-gradient-start: $primary; // gradient begin
$dashboard-banner-gradient-end: #1e2a63; $dashboard-banner-gradient-end: lighten($primary, 5); // gradient end
// gradient end
$dashboard-banner-network-plain-container-background-color: #273781 $dashboard-banner-network-plain-container-background-color: #20446e; // stats bg
; // stats bg
// navigation // navigation
@ -37,20 +35,21 @@ $dashboard-banner-network-plain-container-background-color: #273781
// buttons // buttons
$btn-line-bg: #fff; // button bg $btn-line-bg: #fff; // button bg
$btn-line-color: $primary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color
$btn-copy-color: $primary; // btn copy $btn-copy-color: $secondary; // btn copy
$btn-qr-color: $primary; // btn qr-code $btn-qr-color: $secondary; // btn qr-code
$btn-address-card-icon-color: $secondary; // btn address color $btn-address-card-icon-color: $secondary; // btn address color
$btn-contract-color: $secondary;
//links & tile //links & tile
$tile-body-a-color: $tertiary; $tile-body-a-color: $secondary;
$tile-type-block-color: $primary; $tile-type-block-color: $secondary;
$tile-type-progress-bar-color: $primary; $tile-type-progress-bar-color: $secondary;
a.tile-title { color: $primary !important; } a.tile-title { color: $secondary !important; }
// card // card
$card-background-1: $primary; $card-background-1: $secondary;
$card-tab-active: $primary; $card-tab-active: $secondary;
.layout-container { .layout-container {
.dashboard-banner-container { .dashboard-banner-container {
@ -68,20 +67,6 @@ $badge-neutral-background-color: rgba(#20446e, .1);
$api-text-monospace-color: #20446e; $api-text-monospace-color: #20446e;
// Dark theme // Dark theme
$dark-primary: #233174; $dark-primary: #15bba6;
$dark-secondary:#15f9bb; $dark-secondary: #93d7ff;
$dark-tertiary: #5a77ff; $dark-primary-alternate: #15bba6;
.dark-theme-applied .tile .tile-body a, .dark-theme-applied .tile span[data-address-hash] {
color: $dark-tertiary!important;
}
.dark-theme-applied .btn-line {
background-color: transparent!important;
border-color: $dark-tertiary!important;
color: $dark-tertiary!important;
}
.dark-theme-applied .btn-line:hover {
color: $additional-font!important;
}

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 10 KiB

@ -1 +1 @@
<svg height="30" width="30" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><path d="m0 30v-30h30v30z" fill="#202d6a"/><path d="m17.172 15 5.828 7.001h-4.344.775c-.497 0-.926-.229-1.223-.569l-.015.012-2.654-3.187h-.011a.7.7 0 0 0 -.528-.243.7.7 0 0 0 -.528.243h-.012l-2.653 3.187-.015-.012c-.297.34-.726.569-1.223.569h.774-4.344l5.829-7.001-5.829-7h3.569l.001-.001c.497 0 .926.229 1.223.569l.014-.012 2.652 3.185h.012c.13.147.315.245.53.245s.4-.098.53-.245h.011l2.652-3.185.015.012a1.618 1.618 0 0 1 1.224-.568h3.569z" fill="#15f9bb"/></g></svg> <svg height="30" width="30" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><path d="m30 14.999v15.001h-30v-30h30z" fill="#12ac97"/><path d="m17.172 14.999 5.828 7h-4.344v-.001h.775c-.497 0-.926-.228-1.223-.568l-.015.012-2.655-3.188h-.019a.681.681 0 0 0 -.519-.246.681.681 0 0 0 -.519.246h-.019l-2.655 3.188-.015-.012c-.297.34-.726.568-1.223.568h.775v.001h-4.344l5.828-7-5.828-7h3.569c.497 0 .926.228 1.223.568l.015-.011 2.651 3.184h.019a.682.682 0 0 0 .523.252.682.682 0 0 0 .523-.252h.018l2.652-3.184.015.011c.297-.34.726-.568 1.223-.568h3.569z" fill="#fff"/></g></svg>

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 581 B

Loading…
Cancel
Save