Merge branch 'master' into ab-add-verification-submission-comment

pull/2588/head
Ayrat Badykov 5 years ago committed by GitHub
commit c835204ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      apps/block_scout_web/assets/css/_images-preload.scss
  2. 3
      apps/block_scout_web/assets/css/components/_network-selector.scss
  3. 6
      apps/block_scout_web/assets/css/theme/_dai_variables-non-critical.scss
  4. 6
      apps/block_scout_web/assets/css/theme/_ether1_variables-non-critical.scss
  5. 6
      apps/block_scout_web/assets/css/theme/_ethereum_classic_variables-non-critical.scss
  6. 6
      apps/block_scout_web/assets/css/theme/_ethereum_variables-non-critical.scss
  7. 7
      apps/block_scout_web/assets/css/theme/_goerli_variables-non-critical.scss
  8. 6
      apps/block_scout_web/assets/css/theme/_kovan_variables-non-critical.scss
  9. 6
      apps/block_scout_web/assets/css/theme/_lukso_variables-non-critical.scss
  10. 6
      apps/block_scout_web/assets/css/theme/_neutral_variables-non-critical.scss
  11. 6
      apps/block_scout_web/assets/css/theme/_poa_variables-non-critical.scss
  12. 6
      apps/block_scout_web/assets/css/theme/_rinkeby_variables-non-critical.scss
  13. 6
      apps/block_scout_web/assets/css/theme/_ropsten_variables-non-critical.scss
  14. 6
      apps/block_scout_web/assets/css/theme/_rsk_variables-non-critical.scss
  15. 7
      apps/block_scout_web/assets/css/theme/_sokol_variables-non-critical.scss

@ -2,6 +2,7 @@ body:after {
position:absolute; width:0; height:0; overflow:hidden; z-index:-1; position:absolute; width:0; height:0; overflow:hidden; z-index:-1;
content: content:
url(/images/network-selector-icons/callisto-mainnet.png) url(/images/network-selector-icons/callisto-mainnet.png)
url(/images/network-selector-icons/ethereum-mainnet.png)
url(/images/network-selector-icons/ethereum-classic.png) url(/images/network-selector-icons/ethereum-classic.png)
url(/images/network-selector-icons/goerli-testnet.png) url(/images/network-selector-icons/goerli-testnet.png)
url(/images/network-selector-icons/kovan-testnet.png) url(/images/network-selector-icons/kovan-testnet.png)

@ -247,6 +247,9 @@ $network-selector-item-icon-dimensions: 30px !default;
&-callisto-mainnet { &-callisto-mainnet {
background-image: url(/images/network-selector-icons/callisto-mainnet.png) background-image: url(/images/network-selector-icons/callisto-mainnet.png)
} }
&-ethereum-mainnet {
background-image: url(/images/network-selector-icons/ethereum-mainnet.png)
}
&-ethereum-classic { &-ethereum-classic {
background-image: url(/images/network-selector-icons/ethereum-classic.png) background-image: url(/images/network-selector-icons/ethereum-classic.png)
} }

@ -1 +1,7 @@
// general
$primary: #17314f;
$secondary: #15bba6;
$tertiary: #93d7ff;
$additional-font: #fff;
$btn-line-color: $secondary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #840032;
$secondary: #343434;
$tertiary: #7f7f7f;
$additional-font: #ff95db;
$btn-line-color: #4b021e; // button border and font color && hover bg color $btn-line-color: #4b021e; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #1c1c3d;
$secondary: #4ad7a7;
$tertiary: #5959d8;
$additional-font: #bdbdff;
$btn-line-color: $tertiary; // button border and font color && hover bg color $btn-line-color: $tertiary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #153550;
$secondary: #49a2ee;
$tertiary: #4ad7a7;
$additional-font: #89cae6;
$btn-line-color: $secondary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color

@ -1 +1,8 @@
// general
$primary: #2b2b2b;
$secondary: #eac247;
$tertiary: #929292;
$additional-font: #ffffff;
$sub-accent-color: #a46f30;
$btn-line-color: $sub-accent-color; // button border and font color && hover bg color $btn-line-color: $sub-accent-color; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #101f25;
$secondary: #35e3d8;
$tertiary: #1f857f;
$additional-font: #99fff9;
$btn-line-color: $tertiary; // button border and font color && hover bg color $btn-line-color: $tertiary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #1d3154;
$secondary: #fdcec4;
$tertiary: #a96c55;
$additional-font: #a1ded1;
$btn-line-color: $primary; // button border and font color && hover bg color $btn-line-color: $primary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #5c34a2;
$secondary: #87e1a9;
$tertiary: #bf9cff;
$additional-font: #fff;
$btn-line-color: $primary; // button border and font color && hover bg color $btn-line-color: $primary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #5c34a2;
$secondary: #87e1a9;
$tertiary: #bf9cff;
$additional-font: #fff;
$btn-line-color: $primary; // button border and font color && hover bg color $btn-line-color: $primary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #153550;
$secondary: #38a9f5;
$tertiary: #76f1ff;
$additional-font: #89cae6;
$btn-line-color: $secondary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #153550;
$secondary: #38a9f5;
$tertiary: #76f1ff;
$additional-font: #89cae6;
$btn-line-color: $secondary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color

@ -1 +1,7 @@
// general
$primary: #101f25;
$secondary: #27ac8d;
$tertiary: #e39a54;
$additional-font: #a1ded1;
$btn-line-color: $secondary; // button border and font color && hover bg color $btn-line-color: $secondary; // button border and font color && hover bg color

@ -1 +1,8 @@
// general
$primary: #093731;
$secondary: #40bfb2;
$tertiary: #25c9ff;
$additional-font: #93e8dd;
$sub-accent-color: #1c9f90;
$btn-line-color: $sub-accent-color; // button border and font color && hover bg color $btn-line-color: $sub-accent-color; // button border and font color && hover bg color
Loading…
Cancel
Save