Merge branch 'master' into ab-make-pages-async

pull/2012/head
Ayrat Badykov 6 years ago committed by GitHub
commit c579eaf00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CHANGELOG.md
  2. 26
      apps/block_scout_web/assets/css/theme/_dai_variables.scss
  3. 13
      apps/block_scout_web/assets/static/images/dai_logo.svg

@ -1,7 +1,7 @@
## Current ## Current
### Features ### Features
- [#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) - 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) - added new themes and logos for poa, eth, rinkeby, goerli, ropsten, kovan, sokol, xdai, etc, rsk
- [#2010](https://github.com/poanetwork/blockscout/pull/2010) - added "block not found" and "tx not found pages" - [#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 - [#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 - [#1940](https://github.com/poanetwork/blockscout/pull/1940) - qr modal button and background issue

@ -1,14 +1,14 @@
// general // general
$primary: #2b2b2b; $primary: #17314f;
$secondary: #ffb045; $secondary: #69b9d7;
$tertiary: #929292; $tertiary: #15bba6;
$additional-font: #ffffff; $additional-font: #ffffff;
// footer // footer
$footer-background-color: $primary; $footer-background-color: $primary;
$footer-title-color: #fff; $footer-title-color: #fff;
$footer-text-color: #7e7e7e; $footer-text-color: #909dab;
$footer-item-disc-color: $secondary; $footer-item-disc-color: $tertiary;
.footer-logo { filter: brightness(0) invert(1); } .footer-logo { filter: brightness(0) invert(1); }
// dashboard // dashboard
@ -24,7 +24,7 @@ $dashboard-banner-gradient-start: $primary; // gradient begin
$dashboard-banner-gradient-end: lighten($primary, 5); // gradient end $dashboard-banner-gradient-end: lighten($primary, 5); // gradient end
$dashboard-banner-network-plain-container-background-color: #424242; // stats bg $dashboard-banner-network-plain-container-background-color: #20446e; // stats bg
// navigation // navigation
@ -35,16 +35,16 @@ $header-icon-color-hover: $secondary; // nav icon on hover
// buttons // buttons
$btn-line-bg: #fff; // button bg $btn-line-bg: #fff; // button bg
$btn-line-color: #424242; // button border and font color && hover bg color $btn-line-color: $primary; // button border and font color && hover bg color
$btn-copy-color: #424242; // btn copy $btn-copy-color: $primary; // btn copy
$btn-qr-color: #424242; // btn qr-code $btn-qr-color: $primary; // btn qr-code
//links & tile //links & tile
.tile a { color: #4b89fb !important; } // links color for badges .tile a { color: $tertiary !important; } // links color for badges
.tile-type-block { .tile-type-block {
border-left: 4px solid $secondary; border-left: 4px solid $primary;
} // tab active bg } // tab active bg
// card // card
$card-background-1: $secondary; $card-background-1: #1b395c;
$card-tab-active: $secondary; $card-tab-active: $tertiary;

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Loading…
Cancel
Save