Merge branch 'master' into ab-fix-exchange-rates

CHANGELOG.md

@@ -10,6 +10,7 @@
 - [#2403](https://github.com/poanetwork/blockscout/pull/2403) - Return gasPrice field at the result of gettxinfo method
 
 ### Fixes
+- [#2553](https://github.com/poanetwork/blockscout/pull/2553) - Dark theme import to the end of sass
 - [#2550](https://github.com/poanetwork/blockscout/pull/2550) - correctly encode decimal values for frontend
 - [#2549](https://github.com/poanetwork/blockscout/pull/2549) - Fix wrong colour of tooltip
 - [#2548](https://github.com/poanetwork/blockscout/pull/2548) - CSS preload support in Firefox
@@ -37,6 +38,8 @@
 - [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB
 
 ### Chore
+- [#2554](https://github.com/poanetwork/blockscout/pull/2554) - remove extra slash for endpoint url in docs
+- [#2552](https://github.com/poanetwork/blockscout/pull/2552) - remove brackets for token holders percentage
 - [#2507](https://github.com/poanetwork/blockscout/pull/2507) - update minor version of ecto, ex_machina, phoenix_live_reload
 - [#2516](https://github.com/poanetwork/blockscout/pull/2516) - update absinthe plug from fork
 - [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings

apps/block_scout_web/assets/css/app.scss

@@ -75,9 +75,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/table";
 @import "components/navbar";
 @import "components/alerts";
-
-@import "theme/dark-theme";
-
 @import "components/animations";
 @import "components/card";
 @import "components/tile";
@@ -116,6 +113,8 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "components/radio_big";
 @import "components/btn_no_border";
 
+@import "theme/dark-theme";
+
 :export {
   dashboardBannerChartAxisFontColor: $dashboard-banner-chart-axis-font-color;
   dashboardLineColorMarket: $dashboard-line-color-market;

apps/block_scout_web/lib/block_scout_web/templates/api_docs/eth_rpc.html.eex

@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       <h1 class="card-title margin-bottom-sm"><%= gettext("ETH RPC API Documentation") %></h2>
-      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>/api/eth_rpc">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>/api/eth_rpc ]</p>
+      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>api/eth_rpc">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>api/eth_rpc ]</p>
       <p class="card-subtitle margin-bottom-0">
         <%= gettext "This API is provided to support some rpc methods in the exact format specified for ethereum nodes, which can be found " %>
 

apps/block_scout_web/lib/block_scout_web/templates/api_docs/index.html.eex

@@ -2,7 +2,7 @@
   <div class="card">
     <div class="card-body">
       <h1 class="card-title margin-bottom-sm"><%= gettext("API Documentation") %></h2>
-      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>/api">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>/api ]</p>
+      <p class="api-text-monospace" data-endpoint-url="<%= blockscout_url() %>api">[ <%= gettext "Base URL:" %> <%= blockscout_url() %>api ]</p>
       <p class="card-subtitle margin-bottom-0"><%= gettext "This API is provided for developers transitioning their applications from Etherscan to BlockScout. It supports GET and POST requests." %></p>
     </div>
     <div class="api-anchors-list">

apps/block_scout_web/lib/block_scout_web/templates/tokens/holder/_token_balances.html.eex

@@ -11,7 +11,7 @@
         </span>
 
         <%= if show_total_supply_percentage?(@token.total_supply) do %>
-          (<%= total_supply_percentage(@token_balance.value, @token.total_supply) %>)
+          <%= total_supply_percentage(@token_balance.value, @token.total_supply) %>
         <% end %>
       </span>
     </div>