Skip to content

Commit 1ceaf98

Browse files
daattalidaattali
committed
start work to upgrade to BS4 and jquery 3.4
1 parent 67bd805 commit 1ceaf98

37 files changed

Lines changed: 222 additions & 10015 deletions

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ navbar-links:
2222

2323
# Image to show in the navigation bar - works best with a square image
2424
# Remove this parameter if you don't want an image in the navbar
25-
avatar: "/assets/img/avatar-icon.png"
25+
#avatar: "/assets/img/avatar-icon.png"
2626

2727
# By default, the image is cut into a circle. You can disable this behaviour here.
2828
round-avatar: true

‎_includes/disqus.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{%- if site.disqus -%}
22
<div class="disqus-comments">
3-
<div class="comments">
3+
<div class="comments">
44
<div id="disqus_thread"></div>
55
<script type="text/javascript">
6-
var disqus_shortname = '{{ site.disqus }}';
7-
/* ensure that pages with query string get the same discussion */
8-
var url_parts = window.location.href.split("?");
9-
var disqus_url = url_parts[0];
10-
(function() {
11-
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
12-
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
13-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
14-
})();
6+
var disqus_shortname = '{{ site.disqus }}';
7+
/* ensure that pages with query string get the same discussion */
8+
var url_parts = window.location.href.split("?");
9+
var disqus_url = url_parts[0];
10+
(function() {
11+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
12+
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
13+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
14+
})();
1515
</script>
1616
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
17-
</div>
17+
</div>
1818
</div>
1919
{%- endif -%}

‎_includes/ext-css.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% if include.css.sri %}
22
<link href="{{ include.css.href }}" rel="stylesheet" integrity="{{ include.css.sri }}" crossorigin="anonymous">
33
{% elsif include.css.href %}
4-
<link rel="stylesheet" href="{{ include.css.href }}" />
4+
<link rel="stylesheet" href="{{ include.css.href }}">
55
{% else %}
6-
<link rel="stylesheet" href="{{ include.css }}" />
6+
<link rel="stylesheet" href="{{ include.css }}">
77
{% endif %}

‎_includes/fb-comment.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{%- if site.fb_comment_id -%}
22
<div class="comments">
3-
<div id="fb-root"></div>
4-
<script>(function(d, s, id) {
5-
var js, fjs = d.getElementsByTagName(s)[0];
6-
if (d.getElementById(id)) return;
7-
js = d.createElement(s); js.id = id;
8-
js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
9-
fjs.parentNode.insertBefore(js, fjs);
10-
}(document, 'script', 'facebook-jssdk'));</script>
11-
<div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
12-
<noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
3+
<div id="fb-root"></div>
4+
<script>
5+
(function(d, s, id) {
6+
var js, fjs = d.getElementsByTagName(s)[0];
7+
if (d.getElementById(id)) return;
8+
js = d.createElement(s); js.id = id;
9+
js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
10+
fjs.parentNode.insertBefore(js, fjs);
11+
}(document, 'script', 'facebook-jssdk'));
12+
</script>
13+
<div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
14+
<noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
1315
</div>
1416
{%- endif -%}

‎_includes/footer-minimal.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<footer class="footer-min">
22
<div class="text-muted">
3-
{% if site.author %}
4-
{{ site.author }}
5-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
6-
{% endif %}
7-
{% if page.date %}
8-
{{ page.date }}
9-
{% else %}
10-
{{ site.time | date: '%Y' }}
11-
{% endif %}
3+
{% if site.author %}
4+
{{ site.author }}
5+
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
6+
{% endif %}
7+
{% if page.date %}
8+
{{ page.date }}
9+
{% else %}
10+
{{ site.time | date: '%Y' }}
11+
{% endif %}
1212

1313
{% if site.url-pretty %}
14-
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
15-
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
14+
&nbsp;&nbsp;&bull;&nbsp;&nbsp;
15+
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
1616
{% endif %}
1717
</div>
1818
</footer>

‎_includes/footer-scripts.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
1010
{% if js contains 'jquery' %}
1111
<script>
12-
if (typeof jQuery == 'undefined') {
12+
if (typeof jQuery == 'undefined') {
1313
document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
14-
}
14+
}
1515
</script>
1616
{% else %}
1717
<script src="{{ js | relative_url }}"></script>

‎_includes/footer.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<footer>
22
<div class="container beautiful-jekyll-footer">
33
<div class="row">
4-
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
4+
<div class="col-lg-8 offset-lg-2 col-md-10 offset-md-1">
55
{% include social-networks-links.html %}
66
{% if page.footer-extra %}
77
<div class="footer-custom-content">
@@ -10,14 +10,14 @@
1010
{% endif %}
1111
<p class="copyright text-muted">
1212
{% if site.author %}
13-
{{ site.author }}
14-
&nbsp;&bull;&nbsp;
13+
{{ site.author }}
14+
&nbsp;&bull;&nbsp;
1515
{% endif %}
1616
{{ site.time | date: '%Y' }}
1717

1818
{% if site.url-pretty %}
19-
&nbsp;&bull;&nbsp;
20-
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
19+
&nbsp;&bull;&nbsp;
20+
<a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
2121
{% endif %}
2222

2323
{% if site.matomo %}

‎_includes/google_analytics.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{% if site.google_analytics %}
22
<!-- Google Analytics -->
33
<script>
4-
(function (i, s, o, g, r, a, m) {
5-
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
6-
(i[r].q = i[r].q || []).push(arguments)
7-
}, i[r].l = 1 * new Date(); a = s.createElement(o),
8-
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
9-
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
10-
ga('create', '{{ site.google_analytics }}', 'auto');
11-
ga('send', 'pageview');
4+
(function (i, s, o, g, r, a, m) {
5+
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
6+
(i[r].q = i[r].q || []).push(arguments)
7+
}, i[r].l = 1 * new Date(); a = s.createElement(o),
8+
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
9+
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
10+
ga('create', '{{ site.google_analytics }}', 'auto');
11+
ga('send', 'pageview');
1212
</script>
1313
<!-- End Google Analytics -->
1414
{% endif %}

‎_includes/gtag.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{% if site.gtag %}
22
<!-- Global site tag (gtag.js) - Google Analytics -->
33
<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.gtag }}"></script>
4-
<script>
5-
window.dataLayer = window.dataLayer || [];
4+
<script>
5+
window.dataLayer = window.dataLayer || [];
66
function gtag(){dataLayer.push(arguments);}
77
gtag('js', new Date());
8-
98
gtag('config', '{{ site.gtag }}');
109
</script>
1110
{% endif %}

‎_includes/gtm_body.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% if site.gtm %}
2-
<!-- Google Tag Manager (noscript) -->
3-
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}"
4-
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
5-
<!-- End Google Tag Manager (noscript) -->
2+
<!-- Google Tag Manager (noscript) -->
3+
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
4+
<!-- End Google Tag Manager (noscript) -->
65
{% endif %}

0 commit comments

Comments
 (0)