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

merge master

Browse source
This commit is contained in:
Arvind Tiwari 2018-04-09 03:09:05 +05:30
commit 6e95e3d885
5 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changelog
View file

@ -1,4 +1,5 @@
next: next:
* #4396: [ungleich] add favicon to ungleich blog
* #4327: [dcl] fix navbar logo repeat * #4327: [dcl] fix navbar logo repeat
* bgfix: [dcl] remove ghost migrations from squashed migration * bgfix: [dcl] remove ghost migrations from squashed migration
1.6.4: 2018-04-06 1.6.4: 2018-04-06

2
datacenterlight/migrations/0018_auto_20180403_1930.py
View file

@ -8,8 +8,6 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
replaces = [('datacenterlight', '0018_auto_20180403_1930'), ('datacenterlight', '0019_auto_20180403_2054')]
dependencies = [ dependencies = [
('datacenterlight', '0017_auto_20180329_0056'), ('datacenterlight', '0017_auto_20180329_0056'),
('sites', '0002_alter_domain_unique'), ('sites', '0002_alter_domain_unique'),

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:// -->