Merge branch 'addfavicon' into 'master'

Change favicon to an LCA-appropriate favicon. See merge request !14
2017-07-04 09:13:37 +00:00 · 2017-07-04 09:13:37 +00:00 · e668bf03c2
commit e668bf03c2
parent 38b231c5d9 f990dfd212
6 changed files with 1 additions and 1 deletions
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@ -17,7 +17,7 @@
      <link href="{% static 'css/bootstrap.css' %}" rel="stylesheet">
      <link href="{% static 'css/app.css' %}" rel="stylesheet">

-      <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}">
+      <link rel="icon" href="{% static 'lca2018/images/favicon.png' %}">
    {% block extra_style %}{% endblock %}
    {% endblock %}

--- a/static/src/lca2018/css/app.css
+++ b/static/src/lca2018/css/app.css
--- a/static/src/lca2018/css/maps/app.css.map
+++ b/static/src/lca2018/css/maps/app.css.map
--- a/static/src/lca2018/css/maps/print.css.map
+++ b/static/src/lca2018/css/maps/print.css.map
--- a/static/src/lca2018/css/print.css
+++ b/static/src/lca2018/css/print.css
--- a/static/src/lca2018/images/favicon.ico
+++ b/static/src/lca2018/images/favicon.ico