Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: safari favicon #16

Merged
merged 2 commits into from
Apr 11, 2022
Merged

fix: safari favicon #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4282d2d
Revert "Merge pull request #11 from matter-labs/dr-zkf-1683-buttons-o…
JackHamer09 Apr 11, 2022
ffcced0
fix: replace incorrect safari favicon
JackHamer09 Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified apps/block_scout_web/assets/static/apple-touch-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
158 changes: 67 additions & 91 deletions apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,118 +15,98 @@
<ul class="navbar-nav">
<%= if Application.get_env(:block_scout_web, BlockScoutWeb.WebRouter)[:enabled] do %>
<li class="nav-item dropdown">
<div id="navbarBlocksDropdown" class="nav-link topnav-nav-link dropdown-toggle" role="button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="nav-link topnav-nav-link dropdown-toggle" href="#" id="navbarBlocksDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_block_icon.html" %>
</span>
<%= gettext("Blocks") %>
</a>
<div class="dropdown-menu" aria-labelledby="navbarBlocksDropdown">
<%= link to: blocks_path(@conn, :index), class: "dropdown-item #{tab_status("blocks", @conn.request_path)}" do %>
<%= gettext("Blocks") %>
<% end %>
<%= link to: uncle_path(@conn, :uncle), class: "dropdown-item #{tab_status("uncles", @conn.request_path)}" do %>
<%= gettext("Uncles") %>
<% end %>
<%= link to: reorg_path(@conn, :reorg), class: "dropdown-item #{tab_status("reorgs", @conn.request_path)}" do %>
<%= gettext("Forked Blocks (Reorgs)") %>
<% end %>
</div>
<ul class="dropdown-menu" role="menu" aria-labelledby="navbarBlocksDropdown">
<li>
<%= link to: blocks_path(@conn, :index), class: "dropdown-item #{tab_status("blocks", @conn.request_path)}" do %>
<%= gettext("Blocks") %>
<% end %>
</li>
<li>
<%= link to: uncle_path(@conn, :uncle), class: "dropdown-item #{tab_status("uncles", @conn.request_path)}" do %>
<%= gettext("Uncles") %>
<% end %>
</li>
<li>
<%= link to: reorg_path(@conn, :reorg), class: "dropdown-item #{tab_status("reorgs", @conn.request_path)}" do %>
<%= gettext("Forked Blocks (Reorgs)") %>
<% end %>
</li>
</ul>
</li>
<li class="nav-item dropdown">
<div id="navbarTransactionsDropdown" class="nav-link topnav-nav-link dropdown-toggle" role="button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li class="nav-item dropdown"> <li class="nav-item dropdown" id="activeTransactions">
<a href="#" role="button" id="navbarTransactionsDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_transaction_icon.html" %>
</span>
<%= gettext("Transactions") %>
</div>
<ul class="dropdown-menu" role="menu" aria-labeledby="navbarTransactionsDropdown">
<li>
<%= link(
</a>
<div class="dropdown-menu" aria-labeledby="navbarTransactionsDropdown">
<%= link(
gettext("Validated"),
class: "dropdown-item #{tab_status("txs", @conn.request_path)}",
to: transaction_path(@conn, :index)
) %>
</li>
<% json_rpc_named_arguments = Application.fetch_env!(:indexer, :json_rpc_named_arguments)%>
</ul>
</div>
</li>
<%= if Chain.bridged_tokens_enabled?() do %>
<li class="nav-item dropdown">
<div id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" role="button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a href="#" role="button" id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %>
</span>
<%= gettext("Tokens") %>
</a>
<div class="dropdown-menu" aria-labeledby="navbarTransactionsDropdown">
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
to: tokens_path(@conn, :index)
) %>
<%= link(
gettext("Bridged from Ethereum"),
class: "dropdown-item #{tab_status("bridged-tokens/eth", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :eth),
style: "white-space: nowrap;"
) %>
<%= link(
gettext("Bridged from BSC"),
class: "dropdown-item #{tab_status("bridged-tokens/bsc", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :bsc)
) %>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</div>
<ul class="dropdown-menu" role="menu" aria-labeledby="navbarTokensDropdown">
<li>
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
to: tokens_path(@conn, :index)
) %>
</li>
<li>
<%= link(
gettext("Bridged from Ethereum"),
class: "dropdown-item #{tab_status("bridged-tokens/eth", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :eth),
style: "white-space: nowrap;"
) %>
</li>
<li>
<%= link(
gettext("Bridged from BSC"),
class: "dropdown-item #{tab_status("bridged-tokens/bsc", @conn.request_path)}",
to: bridged_tokens_path(@conn, :show, :bsc)
) %>
</li>
<li>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</li>
</ul>
</li>
<% else %>
<li class="nav-item dropdown">
<div id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" role="button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a href="#" role="button" id="navbarTokensDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_tokens_icon.html" %>
</span>
<%= gettext("Tokens") %>
</a>
<div class="dropdown-menu" aria-labeledby="navbarTransactionsDropdown">
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
to: tokens_path(@conn, :index)
) %>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</div>
<ul class="dropdown-menu" role="menu" aria-labeledby="navbarTokensDropdown">
<li>
<%= link(
gettext("All"),
class: "dropdown-item #{tab_status("tokens", @conn.request_path)}",
to: tokens_path(@conn, :index)
) %>
</li>
<li>
<%= link(
gettext("Ether"),
class: "dropdown-item #{tab_status("accounts", @conn.request_path)}",
to: address_path(@conn, :index)
) %>
</li>
</ul>
</li>
<% end %>
<% end %>
<%= if apps_menu == true || staking_enabled_in_menu do %>
<li class="nav-item dropdown">
<div id="navbarAppsDropdown" class="nav-link topnav-nav-link dropdown-toggle" role="button" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a href="#" role="button" id="navbarAppsDropdown" class="nav-link topnav-nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_apps_icon.html" %>
</span>
Expand All @@ -135,37 +115,33 @@
<% else %>
<%= gettext("Stakes") %>
<% end %>
</div>
<ul class="dropdown-menu" role="menu" aria-labeledby="navbarAppsDropdown">
</a>
<div class="dropdown-menu" aria-labeledby="navbarAppsDropdown">
<%= if staking_enabled_in_menu do %>
<li>
<a class="dropdown-item <%= #{tab_status("validators", @conn.request_path)} %>" href="<%= validators_path(@conn, :index) %>">
<%= gettext("Staking") %>
<span class="bs-label secondary right from-dropdown">New</span>
</a>
</li>
<a class="dropdown-item <%= #{tab_status("validators", @conn.request_path)} %>" href="<%= validators_path(@conn, :index) %>">
<%= gettext("Staking") %>
<span class="bs-label secondary right from-dropdown">New</span>
</a>
<% end %>
<%= if apps_menu == true do %>
<%= for %{url: url, title: title} <- external_apps_list() do %>
<li>
<%= for %{url: url, title: title} <- external_apps_list() do %>
<a href="<%= url %>" class="dropdown-item" target="_blank"><%= title %>
<span class="external-link-icon">
<%= render BlockScoutWeb.IconsView, "_external_link.html" %>
</span>
</a>
</li>
<% end %>
<% end %>
</ul>
</div>
</li>
<% end %>
<li class="nav-item">
<div class="nav-link topnav-nav-link active-icon">
<a class="nav-link topnav-nav-link active-icon" href="#" id="navbarDropdown" role="button">
<span class="nav-link-icon">
<%= render BlockScoutWeb.IconsView, "_active_icon.html" %>
</span>
<%= subnetwork_title() %>
</div>
</a>
</li>
</ul>
<!-- Dark mode changer -->
Expand All @@ -178,4 +154,4 @@
</div>
</div>
<%= render BlockScoutWeb.LayoutView, "_search.html", conn: @conn, id: "main-search-autocomplete-mobile", additional_classes: ["mobile-search-show"] %>
</nav>
</nav>
1 change: 0 additions & 1 deletion apps/block_scout_web/lib/block_scout_web/templates/layout/app.html.eex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<link rel="icon" type="image/png" sizes="32x32" href="<%= static_path(@conn, "/images/favicon-32x32.png") %>">
<link rel="icon" type="image/png" sizes="16x16" href="<%= static_path(@conn, "/images/favicon-16x16.png") %>">
<link rel="manifest" href="<%= static_path(@conn, "/manifest.webmanifest") %>">
<link rel="mask-icon" href="<%= static_path(@conn, "/safari-pinned-tab.svg") %>" color="#5bbad5">
<link rel="shortcut icon" type='image/x-icon' href="<%= static_path(@conn, "/images/favicon.ico") %>">
<meta name="msapplication-TileColor" content="#7dd79f">
<meta name="msapplication-config" content="<%= static_path(@conn, "/browserconfig.xml") %>">
Expand Down
Loading