aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shardweb/assets/static/favicon.icobin24722 -> 16958 bytes
-rw-r--r--shardweb/assets/static/favicon.pngbin0 -> 4548 bytes
-rw-r--r--shardweb/lib/endpoint.ex2
-rw-r--r--shardweb/lib/templates/layout/app.html.eex4
4 files changed, 5 insertions, 1 deletions
diff --git a/shardweb/assets/static/favicon.ico b/shardweb/assets/static/favicon.ico
index cbb6b79..a1ffdc7 100644
--- a/shardweb/assets/static/favicon.ico
+++ b/shardweb/assets/static/favicon.ico
Binary files differ
diff --git a/shardweb/assets/static/favicon.png b/shardweb/assets/static/favicon.png
new file mode 100644
index 0000000..c7db470
--- /dev/null
+++ b/shardweb/assets/static/favicon.png
Binary files differ
diff --git a/shardweb/lib/endpoint.ex b/shardweb/lib/endpoint.ex
index fb8a48f..bc75357 100644
--- a/shardweb/lib/endpoint.ex
+++ b/shardweb/lib/endpoint.ex
@@ -9,7 +9,7 @@ defmodule ShardWeb.Endpoint do
# when deploying your static files in production.
plug Plug.Static,
at: "/", from: :shardweb, gzip: false,
- only: ~w(css fonts font-awesome images js favicon.ico robots.txt)
+ only: ~w(css fonts font-awesome images js favicon.ico favicon.png robots.txt)
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
diff --git a/shardweb/lib/templates/layout/app.html.eex b/shardweb/lib/templates/layout/app.html.eex
index 9c5a358..c6ebcd2 100644
--- a/shardweb/lib/templates/layout/app.html.eex
+++ b/shardweb/lib/templates/layout/app.html.eex
@@ -11,6 +11,10 @@
<title>Shard.</title>
+ <link rel="icon" href="<%= static_path(@conn, "/favicon.ico") %>" />
+ <link rel="icon" href="<%= static_path(@conn, "/favicon.png") %>" type="image/png" />
+
+
<!-- Bootstrap Core CSS -->
<link href="<%= static_path(@conn, "/css/bootstrap.min.css") %>" rel="stylesheet">