Merge branch 'master' into 'master'

Moved JS to bottom See merge request unitoo/unitoo-site!57
2020-04-07 09:12:12 +00:00 · 2020-04-07 09:12:12 +00:00 · f2bbec5c7f
commit f2bbec5c7f
parent 5571aad582 8dca305880
55 changed files with 56 additions and 55 deletions
--- a/_includes/head.html
+++ b/_includes/head.html
@ -14,8 +14,6 @@
 	<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 	<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">

-  {% asset app.js %}
-
  {% if site.tags != "" %}
    {% include collecttags.html %}
  {% endif %}
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -15,6 +15,8 @@

 	{% include footer.html %}

+  {% asset app.js %}
+
  {% include cookie-consent.html %}
 </body>

--- a/_layouts/simple.html
+++ b/_layouts/simple.html
@ -4,13 +4,14 @@
 {% include head.html %}

 <body>
-
 	{% include header.html %}

  {{ content }}

 	{% include footer.html %}

+  {% asset app.js %}
+
  {% include cookie-consent.html %}
 </body>

--- a/_site/404.html
+++ b/_site/404.html
--- a/_site/azienda/mission/index.html
+++ b/_site/azienda/mission/index.html
--- a/_site/azienda/vision/index.html
+++ b/_site/azienda/vision/index.html
--- a/_site/contattaci/index.html
+++ b/_site/contattaci/index.html
--- a/_site/feed.xml
+++ b/_site/feed.xml
@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://www.unitoo.it/feed.xml" rel="self" type="application/atom+xml"/><link href="https://www.unitoo.it/" rel="alternate" type="text/html"/><updated>2020-04-05T15:02:12+02:00</updated><id>https://www.unitoo.it/feed.xml</id><title type="html">Unitoo</title><subtitle>Azienda dedicata allo sviluppo software, alla formazione dei team e alla consulenza informatica</subtitle></feed>
+<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"><generator uri="https://jekyllrb.com/" version="3.8.6">Jekyll</generator><link href="https://www.unitoo.it/feed.xml" rel="self" type="application/atom+xml"/><link href="https://www.unitoo.it/" rel="alternate" type="text/html"/><updated>2020-04-07T11:09:41+02:00</updated><id>https://www.unitoo.it/feed.xml</id><title type="html">Unitoo</title><subtitle>Azienda dedicata allo sviluppo software, alla formazione dei team e alla consulenza informatica</subtitle></feed>
--- a/_site/index.html
+++ b/_site/index.html
--- a/_site/progetti/comunicazione_sicura/index.html
+++ b/_site/progetti/comunicazione_sicura/index.html
--- a/_site/progetti/libreboot/index.html
+++ b/_site/progetti/libreboot/index.html
--- a/_site/progetti/radio/index.html
+++ b/_site/progetti/radio/index.html
--- a/_site/progetti/software/index.html
+++ b/_site/progetti/software/index.html
--- a/_site/servizi/consulenza/index.html
+++ b/_site/servizi/consulenza/index.html
--- a/_site/servizi/formazione/index.html
+++ b/_site/servizi/formazione/index.html
--- a/_site/servizi/sicurezza_informatica/index.html
+++ b/_site/servizi/sicurezza_informatica/index.html
--- a/_site/servizi/sviluppo_software/index.html
+++ b/_site/servizi/sviluppo_software/index.html
--- a/_site/tag/agile.html
+++ b/_site/tag/agile.html
--- a/_site/tag/azuracast.html
+++ b/_site/tag/azuracast.html
--- a/_site/tag/backup.html
+++ b/_site/tag/backup.html
--- a/_site/tag/bios.html
+++ b/_site/tag/bios.html
--- a/_site/tag/cifratura.html
+++ b/_site/tag/cifratura.html
--- a/_site/tag/company.html
+++ b/_site/tag/company.html
--- a/_site/tag/consulenza.html
+++ b/_site/tag/consulenza.html
--- a/_site/tag/contatti.html
+++ b/_site/tag/contatti.html
--- a/_site/tag/data.html
+++ b/_site/tag/data.html
--- a/_site/tag/development.html
+++ b/_site/tag/development.html
--- a/_site/tag/email.html
+++ b/_site/tag/email.html
--- a/_site/tag/formazione.html
+++ b/_site/tag/formazione.html
--- a/_site/tag/freebios.html
+++ b/_site/tag/freebios.html
--- a/_site/tag/freedom.html
+++ b/_site/tag/freedom.html
--- a/_site/tag/freesoftware.html
+++ b/_site/tag/freesoftware.html
--- a/_site/tag/future.html
+++ b/_site/tag/future.html
--- a/_site/tag/gnupg.html
+++ b/_site/tag/gnupg.html
--- a/_site/tag/hardening.html
+++ b/_site/tag/hardening.html
--- a/_site/tag/hardware.html
+++ b/_site/tag/hardware.html
--- a/_site/tag/informatica.html
+++ b/_site/tag/informatica.html
--- a/_site/tag/libreboot.html
+++ b/_site/tag/libreboot.html
--- a/_site/tag/licenses.html
+++ b/_site/tag/licenses.html
--- a/_site/tag/media.html
+++ b/_site/tag/media.html
--- a/_site/tag/mission.html
+++ b/_site/tag/mission.html
--- a/_site/tag/nodrm.html
+++ b/_site/tag/nodrm.html
--- a/_site/tag/planning.html
+++ b/_site/tag/planning.html
--- a/_site/tag/projects.html
+++ b/_site/tag/projects.html
--- a/_site/tag/radio.html
+++ b/_site/tag/radio.html
--- a/_site/tag/rights.html
+++ b/_site/tag/rights.html
--- a/_site/tag/security.html
+++ b/_site/tag/security.html
--- a/_site/tag/servizi.html
+++ b/_site/tag/servizi.html
--- a/_site/tag/sicurezza.html
+++ b/_site/tag/sicurezza.html
--- a/_site/tag/social.html
+++ b/_site/tag/social.html
--- a/_site/tag/software.html
+++ b/_site/tag/software.html
--- a/_site/tag/team.html
+++ b/_site/tag/team.html
--- a/_site/tag/unitoo.html
+++ b/_site/tag/unitoo.html
--- a/_site/tag/vision.html
+++ b/_site/tag/vision.html
--- a/_site/tag/work.html
+++ b/_site/tag/work.html