moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #616 from tiwariav/bugfix/4396/ungleich_favicon

Browse source 
Bugfix/4396 ungleich favicon
This commit is contained in:
Arvind Tiwari 2018-04-09 03:08:03 +05:30 • committed by GitHub
commit 79b5ff6e2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,3 +1,5 @@
next:
* #4396: [ungleich] add favicon to ungleich blog
1.6.4: 2018-04-06 1.6.4: 2018-04-06
* #4362: [cms] Fix the need of dummy home page for different CMS-based sites * #4362: [cms] Fix the need of dummy home page for different CMS-based sites
1.6.3: 2018-04-05 1.6.3: 2018-04-05

2
digitalglarus/templates/new_base_glarus_c.html
View file

@ -57,7 +57,7 @@
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}" type="image/x-icon">
<style id="igtranslator-color" type="text/css"></style> <style id="igtranslator-color" type="text/css"></style>
<style type="text/css"> <style type="text/css">

2
ungleich/templates/cms/ungleichch/base_ungleich.html
View file

@ -35,6 +35,8 @@
{% render_block "external-css" %} {% render_block "external-css" %}
{% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %} {% render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
<link rel="shortcut icon" href="{% static 'ungleich_page/img/favicon.ico' %}"/>
<!-- Google analytics --> <!-- Google analytics -->
{% include "google_analytics.html" %} {% include "google_analytics.html" %}
<!-- End Google Analytics --> <!-- End Google Analytics -->

2
ungleich_page/templates/ungleich_page/404.html
View file

@ -23,7 +23,7 @@
<!-- External Fonts --> <!-- External Fonts -->
<link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Lato:300,400,600,700" rel="stylesheet" type="text/css">
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="{% static 'ungleich_page/img/favicon.ico' %}" type="image/x-icon" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->