archive
/
pelican-mg
mirror of https://github.com/c0de-archive/pelican-mg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes

This commit is contained in:
Luca Chiricozzi 2016-01-03 19:42:12 +01:00
parent 9ec437c9ca 0e7ca19331
commit 88616fa048
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/base.html
View File

@ -52,10 +52,10 @@
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.23.0/css/uikit.min.css">
{% if not DISABLE_SEARCH %}
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/uikit/2.23.0/css/components/search.min.css">
<link rel="stylesheet" href="/theme/css/tipuesearch.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/tipuesearch.css">
{% endif %}
<link rel="stylesheet" href="/theme/css/solarized.css">
<link rel="stylesheet" href="/theme/css/main.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/solarized.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/main.css">
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js"></script>
</head>
@ -198,15 +198,15 @@
<script src="//cdnjs.cloudflare.com/ajax/libs/uikit/2.23.0/js/uikit.min.js"></script>
{% if not DISABLE_SEARCH %}
<script src="//cdnjs.cloudflare.com/ajax/libs/uikit/2.23.0/js/components/search.min.js"></script>
<script src="/theme/js/tipuesearch_set.js"></script>
<script src="/theme/js/tipuesearch.js"></script>
<script src="{{ SITEURL }}/theme/js/tipuesearch_set.js"></script>
<script src="{{ SITEURL }}/theme/js/tipuesearch.js"></script>
{% endif %}
<script src="/theme/js/jquery.sticky-kit.js"></script>
<script src="/theme/js/plugins.js"></script>
<script src="{{ SITEURL }}/theme/js/jquery.sticky-kit.js"></script>
<script src="{{ SITEURL }}/theme/js/plugins.js"></script>
{% if DISABLE_SEARCH %}
<script src="/theme/js/main.js"></script>
<script src="{{ SITEURL }}/theme/js/main.js"></script>
{% else %}
<script src="/theme/js/main-search.js"></script>
<script src="{{ SITEURL }}/theme/js/main-search.js"></script>
{% endif %}
{% include 'disqus_count.html' %}

2
templates/disqus_count.html
View File

@ -11,4 +11,4 @@ var disqus_shortname = '{{ DISQUS_SITENAME }}'; // required: replace example wit
(document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
}());
</script>
{% endif %}
{% endif %}