From 9d6efa63856551c8d42b46f71fb9e97f015d8b7c Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Wed, 7 Oct 2020 01:04:54 +0300 Subject: [PATCH] Fix flickering between light and custom themes --- .../templates/address/overview.html.eex | 11 ------- .../templates/layout/app.html.eex | 11 +++++++ apps/block_scout_web/priv/gettext/default.pot | 32 +++++++++---------- .../priv/gettext/en/LC_MESSAGES/default.po | 32 +++++++++---------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex index 5fd359a5d9..e6257f8988 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/overview.html.eex @@ -2,17 +2,6 @@ <% dark_forest_address_var = Application.get_env(:block_scout_web, :dark_forest_address) %> <% dark_forest_address = if dark_forest_address_var, do: String.downcase(dark_forest_address_var), else: nil %> <% current_address = "0x" <> Base.encode16(@address.hash.bytes, case: :lower) %> -
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex index 3634ac4089..ddb6b081e3 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex @@ -36,7 +36,17 @@ + <% dark_forest_address_var = Application.get_env(:block_scout_web, :dark_forest_address) %> + <% dark_forest_address = if dark_forest_address_var, do: String.downcase(dark_forest_address_var), else: nil %>
<%= if not Explorer.Chain.finished_indexing?() do %> diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot index 96f47f59d4..378984610d 100644 --- a/apps/block_scout_web/priv/gettext/default.pot +++ b/apps/block_scout_web/priv/gettext/default.pot @@ -72,7 +72,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:67 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -406,8 +406,8 @@ msgid "Copy ABI" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:41 -#: lib/block_scout_web/templates/address/overview.html.eex:45 +#: lib/block_scout_web/templates/address/overview.html.eex:30 +#: lib/block_scout_web/templates/address/overview.html.eex:34 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:16 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:20 msgid "Copy Address" @@ -465,7 +465,7 @@ msgid "Create2" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:124 +#: lib/block_scout_web/templates/address/overview.html.eex:113 msgid "Created by" msgstr "" @@ -536,7 +536,7 @@ msgid "Description" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:36 +#: lib/block_scout_web/templates/address/overview.html.eex:25 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:166 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:127 msgid "Details" @@ -627,7 +627,7 @@ msgid "Error: (Awaiting internal transactions for reason)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:137 +#: lib/block_scout_web/templates/address/overview.html.eex:126 msgid "Error: Could not determine contract creator." msgstr "" @@ -961,7 +961,7 @@ msgid "It could still be in the TX Pool of a different node, waiting to be broad msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:109 +#: lib/block_scout_web/templates/address/overview.html.eex:98 msgid "Last Balance Update: Block #" msgstr "" @@ -1172,8 +1172,8 @@ msgid "Price" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:61 -#: lib/block_scout_web/templates/address/overview.html.eex:161 +#: lib/block_scout_web/templates/address/overview.html.eex:50 +#: lib/block_scout_web/templates/address/overview.html.eex:150 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:51 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:101 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36 @@ -1284,14 +1284,14 @@ msgid "Show" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:62 +#: lib/block_scout_web/templates/address/overview.html.eex:51 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:52 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:37 msgid "Show QR Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:76 +#: lib/block_scout_web/templates/address/overview.html.eex:65 msgid "Show Validator Info" msgstr "" @@ -1556,7 +1556,7 @@ msgid "Validator Data" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:80 +#: lib/block_scout_web/templates/address/overview.html.eex:69 msgid "Validator Info" msgstr "" @@ -1656,7 +1656,7 @@ msgid "Yes" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:129 +#: lib/block_scout_web/templates/address/overview.html.eex:118 msgid "at" msgstr "" @@ -1714,8 +1714,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37 -#: lib/block_scout_web/templates/address/overview.html.eex:162 -#: lib/block_scout_web/templates/address/overview.html.eex:170 +#: lib/block_scout_web/templates/address/overview.html.eex:151 +#: lib/block_scout_web/templates/address/overview.html.eex:159 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:102 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:110 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:122 @@ -1987,6 +1987,6 @@ msgid "Bridged Tokens" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:27 +#: lib/block_scout_web/templates/address/overview.html.eex:16 msgid "zkSnark space warfare (v0.4)" msgstr "" diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po index 96f47f59d4..378984610d 100644 --- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po +++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po @@ -72,7 +72,7 @@ msgid "(query)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/layout/app.html.eex:56 +#: lib/block_scout_web/templates/layout/app.html.eex:67 msgid "- We're indexing this chain right now. Some of the counts may be inaccurate." msgstr "" @@ -406,8 +406,8 @@ msgid "Copy ABI" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:41 -#: lib/block_scout_web/templates/address/overview.html.eex:45 +#: lib/block_scout_web/templates/address/overview.html.eex:30 +#: lib/block_scout_web/templates/address/overview.html.eex:34 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:16 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:20 msgid "Copy Address" @@ -465,7 +465,7 @@ msgid "Create2" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:124 +#: lib/block_scout_web/templates/address/overview.html.eex:113 msgid "Created by" msgstr "" @@ -536,7 +536,7 @@ msgid "Description" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:36 +#: lib/block_scout_web/templates/address/overview.html.eex:25 #: lib/block_scout_web/templates/api_docs/_action_tile.html.eex:166 #: lib/block_scout_web/templates/api_docs/_eth_rpc_item.html.eex:127 msgid "Details" @@ -627,7 +627,7 @@ msgid "Error: (Awaiting internal transactions for reason)" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:137 +#: lib/block_scout_web/templates/address/overview.html.eex:126 msgid "Error: Could not determine contract creator." msgstr "" @@ -961,7 +961,7 @@ msgid "It could still be in the TX Pool of a different node, waiting to be broad msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:109 +#: lib/block_scout_web/templates/address/overview.html.eex:98 msgid "Last Balance Update: Block #" msgstr "" @@ -1172,8 +1172,8 @@ msgid "Price" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:61 -#: lib/block_scout_web/templates/address/overview.html.eex:161 +#: lib/block_scout_web/templates/address/overview.html.eex:50 +#: lib/block_scout_web/templates/address/overview.html.eex:150 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:51 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:101 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:36 @@ -1284,14 +1284,14 @@ msgid "Show" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:62 +#: lib/block_scout_web/templates/address/overview.html.eex:51 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:52 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:37 msgid "Show QR Code" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:76 +#: lib/block_scout_web/templates/address/overview.html.eex:65 msgid "Show Validator Info" msgstr "" @@ -1556,7 +1556,7 @@ msgid "Validator Data" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:80 +#: lib/block_scout_web/templates/address/overview.html.eex:69 msgid "Validator Info" msgstr "" @@ -1656,7 +1656,7 @@ msgid "Yes" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:129 +#: lib/block_scout_web/templates/address/overview.html.eex:118 msgid "at" msgstr "" @@ -1714,8 +1714,8 @@ msgstr "" #, elixir-format #: lib/block_scout_web/templates/address/_validator_metadata_modal.html.eex:37 -#: lib/block_scout_web/templates/address/overview.html.eex:162 -#: lib/block_scout_web/templates/address/overview.html.eex:170 +#: lib/block_scout_web/templates/address/overview.html.eex:151 +#: lib/block_scout_web/templates/address/overview.html.eex:159 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:102 #: lib/block_scout_web/templates/tokens/instance/overview/_details.html.eex:110 #: lib/block_scout_web/templates/tokens/overview/_details.html.eex:122 @@ -1987,6 +1987,6 @@ msgid "Bridged Tokens" msgstr "" #, elixir-format -#: lib/block_scout_web/templates/address/overview.html.eex:27 +#: lib/block_scout_web/templates/address/overview.html.eex:16 msgid "zkSnark space warfare (v0.4)" msgstr ""