Merge branch 'master' into ab-token-transfer-csv-export

6 years ago · a165e0f090
parent 1b009499ed b23422aa9f
commit a165e0f090
19 changed files with 57 additions and 60 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,8 @@
 - [#2075](https://github.com/poanetwork/blockscout/pull/2075) - add blocks cache

 ### Fixes
+- [#2142](https://github.com/poanetwork/blockscout/pull/2142) - Removed posdao theme and logo, added 'page not found' image for goerli
+- [#2138](https://github.com/poanetwork/blockscout/pull/2138) - badge colors issue, api titles issue
 - [#2129](https://github.com/poanetwork/blockscout/pull/2129) - Fix for width of explorer elements
 - [#2121](https://github.com/poanetwork/blockscout/pull/2121) - Binding of 404 page
 - [#2120](https://github.com/poanetwork/blockscout/pull/2120) - footer links and socials focus color issue
--- a/apps/block_scout_web/assets/css/components/_api.scss
+++ b/apps/block_scout_web/assets/css/components/_api.scss
@ -1,7 +1,7 @@
-$api-text-monospace-color: $primary !default;
+$api-text-monospace-color: $secondary !default;
 $api-text-monospace-background: rgba($api-text-monospace-color, 0.1) !default;
 $api-anchors-list-background-color: #f6f7f9 !default;
-$api-doc-list-item-title-color: $primary !default;
+$api-doc-list-item-title-color: #333 !default;
 $api-doc-list-item-view-more-color: $api-doc-list-item-title-color !default;

 .api-text-monospace {
@ -89,8 +89,8 @@ $api-doc-list-item-view-more-color: $api-doc-list-item-title-color !default;

 .api-doc-list-item-title {
  color: $api-doc-list-item-title-color;
-  font-size: 17px;
-  font-weight: 700;
+  font-size: 15px;
+  font-weight: 400;
  line-height: 1.2;
  margin: 0 0 15px;
 }
--- a/apps/block_scout_web/assets/css/components/_badge.scss
+++ b/apps/block_scout_web/assets/css/components/_badge.scss
@ -2,8 +2,8 @@ $badge-success-color: #15bba6 !default;
 $badge-success-background-color: rgba($badge-success-color, 0.1) !default;
 $badge-danger-color: #ed9966 !default;
 $badge-danger-background-color: rgba($badge-danger-color, 0.1) !default;
-$badge-neutral-color: #333 !default;
-$badge-neutral-background-color: #e9e9e9 !default;
+$badge-neutral-color: $secondary !default;
+$badge-neutral-background-color: rgba($secondary, .1) !default;

 .badge {
  color: $white;
--- a/apps/block_scout_web/assets/css/theme/_dai_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_dai_variables.scss
@ -57,4 +57,9 @@ $card-tab-active: $secondary;
 	    $dashboard-banner-gradient-end
 	  );
 	}
-}
+}
+
+// Badges
+$badge-neutral-color: #20446e;
+$badge-neutral-background-color: rgba(#20446e, .1);
+$api-text-monospace-color: #20446e;
--- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss
@ -70,3 +70,8 @@ $card-tab-active: $tertiary;
    filter: brightness(0) invert(1);
  }
 }
+
+// Badges
+$badge-neutral-color: $tertiary;
+$badge-neutral-background-color: rgba($tertiary, .1);
+$api-text-monospace-color: $tertiary;
--- a/apps/block_scout_web/assets/css/theme/_goerli_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_goerli_variables.scss
@ -73,3 +73,8 @@ $card-tab-active: $sub-accent-color;
 	  );
 	}
 }
+
+// Badges
+$badge-neutral-color: $sub-accent-color;
+$badge-neutral-background-color: rgba($sub-accent-color, .1);
+$api-text-monospace-color: $sub-accent-color;
--- a/apps/block_scout_web/assets/css/theme/_kovan_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_kovan_variables.scss
@ -67,4 +67,11 @@ $card-tab-active: $tertiary;
 	    $dashboard-banner-gradient-end
 	  );
 	}
-}
+}
+
+// Badges
+$badge-success-color: #15bba6;
+$badge-success-background-color: rgba(#15bba6, .1);
+$badge-neutral-color: $tertiary;
+$badge-neutral-background-color: rgba($tertiary, .1);
+$api-text-monospace-color: $tertiary;
--- a/apps/block_scout_web/assets/css/theme/_lukso_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_lukso_variables.scss
@ -146,3 +146,8 @@ $dashboard-banner-network-plain-container-height: 150px;
    }
  }
 }
+
+// Badges
+$badge-neutral-color: $tertiary;
+$badge-neutral-background-color: rgba($tertiary, .1);
+$api-text-monospace-color: $tertiary;
--- a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss
@ -59,4 +59,9 @@ $card-tab-active: $primary;
 	    $dashboard-banner-gradient-end
 	  );
 	}
-}
+}
+
+// Badges
+$badge-neutral-color: $primary;
+$badge-neutral-background-color: rgba($primary, .1);
+$api-text-monospace-color: $primary;
--- a/apps/block_scout_web/assets/css/theme/_poa_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_poa_variables.scss
@ -59,4 +59,9 @@ $card-tab-active: $primary;
 	    $dashboard-banner-gradient-end
 	  );
 	}
-}
+}
+
+// Badges
+$badge-neutral-color: $primary;
+$badge-neutral-background-color: rgba($primary, .1);
+$api-text-monospace-color: $primary;
--- a/apps/block_scout_web/assets/css/theme/_posdao_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_posdao_variables.scss
@ -1,29 +0,0 @@
-$primary: #15bba6;
-$secondary: #17314f;
-$tertiary: #00ff00;
-
-$header-links-color-active: #333;
-$dashboard-banner-gradient-start: $secondary;
-$dashboard-banner-gradient-end: #1e4168;
-
-$dashboard-line-color-market: $primary;
-
-$tile-type-block-border-color: $secondary;
-$tile-type-block-color: #333;
-
-$footer-background-color: #173250;
-$footer-text-color: #909dac;
-
-$navbar-logo-height: auto;
-$navbar-logo-width: 100px;
-
-$footer-logo-height: auto;
-$footer-logo-width: 100px;
-
-$card-background-1: $secondary;
-$card-background-1-text-color: #fff;
-
-$btn-copy-color: $secondary;
-$btn-qr-color: $secondary;
-
-$btn-dropdown-line-color: $secondary;
--- a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss
@ -61,3 +61,7 @@ $card-tab-active: $secondary;
      filter: brightness(0) invert(1);
    }
 }
+
+// Badges
+$badge-neutral-color: #1a323b;
+$badge-neutral-background-color: rgba(#1a323b, .1);
--- a/apps/block_scout_web/assets/css/theme/_sokol_variables.scss
+++ b/apps/block_scout_web/assets/css/theme/_sokol_variables.scss
@ -65,3 +65,7 @@ $card-tab-active: $sub-accent-color;
 	  );
 	}
 }
+
+// Badges
+$badge-neutral-color: $tertiary;
+$badge-neutral-background-color: rgba($tertiary, .1);
--- a/apps/block_scout_web/assets/static/images/goerli-page-not-found.png
+++ b/apps/block_scout_web/assets/static/images/goerli-page-not-found.png
--- a/apps/block_scout_web/assets/static/images/goerli-page-not-found@2x.png
+++ b/apps/block_scout_web/assets/static/images/goerli-page-not-found@2x.png
--- a/apps/block_scout_web/assets/static/images/goerli_logo.png
+++ b/apps/block_scout_web/assets/static/images/goerli_logo.png
--- a/apps/block_scout_web/assets/static/images/posdao_logo.png
+++ b/apps/block_scout_web/assets/static/images/posdao_logo.png
--- a/apps/block_scout_web/assets/static/images/posdao_logo_footer.png
+++ b/apps/block_scout_web/assets/static/images/posdao_logo_footer.png
--- a/apps/block_scout_web/assets/static/images/posdao_logo_footer.svg
+++ b/apps/block_scout_web/assets/static/images/posdao_logo_footer.svg
@ -1,21 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="111" height="36">
-    <defs>
-        <linearGradient id="a" x1="0%" x2="0%" y1="100%" y2="0%">
-            <stop offset="0%" stop-color="#FFF" stop-opacity="0"/>
-            <stop offset="100%" stop-color="#FFF"/>
-        </linearGradient>
-        <linearGradient id="b" x1="0%" x2="86.603%" y1="50%" y2="0%">
-            <stop offset="0%" stop-color="#FFF"/>
-            <stop offset="100%" stop-color="#FFF" stop-opacity="0"/>
-        </linearGradient>
-    </defs>
-    <path fill="#FFF" fill-rule="evenodd" d="M16.001 36L.005 26.999V8.998L16.001-.003l15.996 9.001v18.001L16.001 36zm10.074-23.52L15.994 6.83 5.912 12.48v11.301l10.082 5.65 10.081-5.65V12.48z" opacity=".4"/>
-    <path fill="none" d="M0 8.934l5.914 3.688v10.499L0 19.433V8.934z" opacity=".6"/>
-    <path fill="url(#a)" d="M0 8.934l5.914 3.688v10.499L0 19.433V8.934z"/>
-    <path fill="none" d="M31.992 8.934l-5.915 3.688v10.499l5.915-3.688V8.934z" opacity=".6"/>
-    <path fill="url(#a)" d="M31.992 8.934l-5.915 3.688v10.499l5.915-3.688V8.934z"/>
-    <path fill="none" d="M15.861 29.431l10.216-5.541v6.569L15.861 36v-6.569z" opacity=".6"/>
-    <path fill="url(#b)" d="M15.861 29.431l10.216-5.541v6.569L15.861 36v-6.569z"/>
-    <path fill="#FFF" fill-rule="evenodd" d="M16.494 25.007l-6.505-3.504v-7.007l6.505-3.504L23 14.496v7.007l-6.506 3.504z" opacity=".8"/>
-    <path fill="#FFF" fill-rule="evenodd" d="M16.987 17.727l6.014-3.74v7.281l-6.014 3.74v-7.281zM109.56 21.291c-.437.875-1.058 1.547-1.864 2.016-.805.47-1.752.704-2.84.704-1.098 0-2.05-.234-2.856-.704-.805-.469-1.426-1.141-1.864-2.016-.437-.874-.656-1.898-.656-3.072 0-1.173.216-2.194.648-3.064a4.664 4.664 0 0 1 1.864-2.008c.811-.469 1.766-.704 2.864-.704 1.099 0 2.051.235 2.856.704.806.47 1.424 1.139 1.856 2.008.432.87.648 1.891.648 3.064 0 1.174-.218 2.198-.656 3.072zm-2.28-6.136c-.581-.709-1.389-1.064-2.424-1.064-1.045 0-1.858.355-2.44 1.064-.581.71-.872 1.731-.872 3.064 0 1.334.291 2.358.872 3.072.582.715 1.395 1.072 2.44 1.072 1.035 0 1.843-.357 2.424-1.072.582-.714.872-1.738.872-3.072 0-1.333-.29-2.354-.872-3.064zm-9.624 8.776a.91.91 0 0 1-.48-.136.91.91 0 0 1-.352-.424l-.96-2.144h-5.632l-.96 2.144a.898.898 0 0 1-.352.424.932.932 0 0 1-.496.136c-.245 0-.469-.085-.672-.256a.787.787 0 0 1-.304-.624c0-.138.032-.277.096-.416l4.416-9.488c.096-.213.243-.376.44-.488.198-.112.408-.168.632-.168.224 0 .435.056.632.168.198.112.344.275.44.488l4.432 9.488a.989.989 0 0 1 .096.416.791.791 0 0 1-.296.624 1.007 1.007 0 0 1-.68.256zm-4.608-9.056l-2.112 4.752h4.224l-2.112-4.752zm-12.352 8.992h-3.168c-.309 0-.552-.085-.728-.256-.176-.17-.264-.41-.264-.72v-9.328c0-.309.088-.549.264-.72.176-.17.419-.256.728-.256h3.168c1.846 0 3.278.494 4.296 1.48 1.019.987 1.528 2.371 1.528 4.152 0 1.792-.509 3.182-1.528 4.168-1.018.987-2.45 1.48-4.296 1.48zm-.128-9.6H78.6v7.92h1.968c2.592 0 3.888-1.322 3.888-3.968 0-2.634-1.296-3.952-3.888-3.952zm-10.079 3.152c.949.214 1.72.451 2.312.712.592.262 1.045.595 1.36 1 .314.406.472.912.472 1.52a2.9 2.9 0 0 1-.552 1.752c-.368.507-.886.902-1.552 1.184-.667.283-1.432.424-2.296.424a8.061 8.061 0 0 1-2.328-.328c-.731-.218-1.326-.514-1.784-.888-.246-.181-.368-.437-.368-.768a.9.9 0 0 1 .2-.584c.133-.165.29-.248.472-.248.192 0 .41.075.656.224.458.331.938.571 1.44.72a5.79 5.79 0 0 0 1.664.224c.778 0 1.376-.136 1.792-.408.416-.272.624-.669.624-1.192 0-.405-.195-.717-.584-.936-.39-.218-1.038-.429-1.944-.632-.939-.202-1.702-.437-2.288-.704-.587-.266-1.03-.608-1.328-1.024-.299-.416-.448-.944-.448-1.584 0-.661.186-1.253.56-1.776.373-.522.893-.93 1.56-1.224.666-.293 1.416-.44 2.248-.44 1.525 0 2.768.406 3.728 1.216.138.118.237.232.296.344a.919.919 0 0 1 .088.424.903.903 0 0 1-.2.584c-.134.166-.291.248-.472.248a.88.88 0 0 1-.296-.048 2.281 2.281 0 0 1-.36-.176 5.445 5.445 0 0 0-1.272-.712c-.411-.154-.915-.232-1.512-.232-.726 0-1.299.147-1.72.44-.422.294-.632.702-.632 1.224 0 .438.186.774.56 1.008.373.235 1.008.454 1.904.656zm-8.76 5.888c-.806.47-1.752.704-2.84.704-1.099 0-2.051-.234-2.856-.704-.806-.469-1.427-1.141-1.864-2.016-.438-.874-.656-1.898-.656-3.072 0-1.173.216-2.194.648-3.064a4.658 4.658 0 0 1 1.864-2.008c.81-.469 1.765-.704 2.864-.704 1.098 0 2.05.235 2.856.704a4.677 4.677 0 0 1 1.856 2.008c.432.87.648 1.891.648 3.064 0 1.174-.219 2.198-.656 3.072-.438.875-1.059 1.547-1.864 2.016zm-.416-8.152c-.582-.709-1.39-1.064-2.424-1.064-1.046 0-1.859.355-2.44 1.064-.582.71-.872 1.731-.872 3.064 0 1.334.29 2.358.872 3.072.581.715 1.394 1.072 2.44 1.072 1.034 0 1.842-.357 2.424-1.072.581-.714.872-1.738.872-3.072 0-1.333-.291-2.354-.872-3.064zm-13.032 4.328h-2.864v3.44c0 .32-.094.574-.28.76-.187.187-.44.28-.76.28-.31 0-.558-.093-.744-.28-.187-.186-.28-.44-.28-.76v-9.36c0-.309.088-.549.264-.72.176-.17.418-.256.728-.256h3.936c1.205 0 2.144.302 2.816.904.672.603 1.008 1.448 1.008 2.536s-.336 1.936-1.008 2.544c-.672.608-1.611.912-2.816.912zm-.256-5.296h-2.608v3.712h2.608c1.418 0 2.128-.618 2.128-1.856 0-1.237-.71-1.856-2.128-1.856z"/>
-</svg>