diff --git a/_includes/education.html b/_includes/education.html index fe0df4ab..295efde5 100644 --- a/_includes/education.html +++ b/_includes/education.html @@ -6,25 +6,26 @@
{{title}}
{% for education in list %} - {% assign degree = education.degree %} - {% assign details = education.details[site.lang] %} - {% assign university = education.university %} - {% assign time = education.time %} - {% assign link = education.link %} -
-
- {% if link %} {% endif %} - {{degree}} -
- -
{{university}} - -
- {{time.start | date: "%Y"}} - {{time.end | date: "%Y"}} -
-
-
{{ details }}
+ {% assign degree = education.degree %} + {% assign details = education.details[site.lang] %} + {% assign university = education.university %} + {% assign time = education.time %} + {% assign link = education.link %} +
+
+ {% if link %} + {{degree}} + {% else %} + {{degree}} + {% endif %}
+
{{university}} +
+ {{time.start | date: "%Y"}} - {{time.end | date: "%Y"}} +
+
+
{{ details }}
+
{% endfor %}
{% endif %} diff --git a/_includes/experience.html b/_includes/experience.html index 628895ec..d8b8ccdb 100644 --- a/_includes/experience.html +++ b/_includes/experience.html @@ -26,7 +26,7 @@

{{title}}

{% if technos %}

{{techno_title}}: {{technos | join: ", "}}. -

+

{% endif %} {% endfor %} diff --git a/_includes/head.html b/_includes/head.html index c61f88d1..b1ba8fa0 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,14 +1,14 @@ - - - + + + - - - + + + - - + + - {{site.title}} + {{site.title}} diff --git a/_includes/header.html b/_includes/header.html index 4b11fcd8..097d3840 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -10,7 +10,7 @@

{{site.data.header.name}}

{% if lang != site.lang %} {% assign icon = site.translations[lang].icon %} {% capture link %} - {{ site.baseurl_root }}{% if lang != site.languages[0] %}/{{lang}}{% endif %}/ + {{ site.baseurl_root }}{% if lang != site.languages[0] %}/{{lang}}{% endif %}/ {% endcapture %} diff --git a/_includes/languages.html b/_includes/languages.html index eb4ae247..9ca0dbbb 100644 --- a/_includes/languages.html +++ b/_includes/languages.html @@ -5,8 +5,8 @@ {% if idioms %}
{{title}}
- {% for idiom in idioms %} -
{{idiom}}
- {% endfor %} + {% for idiom in idioms %} +
{{idiom}}
+ {% endfor %}
{% endif %} diff --git a/_includes/projects.html b/_includes/projects.html index 67129255..bb9fc610 100644 --- a/_includes/projects.html +++ b/_includes/projects.html @@ -6,22 +6,22 @@

{{ title }}

{% for project in list %} - {% assign title = project.title %} - {% assign details = project.details[site.lang] %} - {% assign language = project.language %} - {% assign link = project.link %} -
- - - {{title}} - - - {{language}} - - -
- {{details}} -
+ {% assign title = project.title %} + {% assign details = project.details[site.lang] %} + {% assign language = project.language %} + {% assign link = project.link %} +
+ + + {{title}} + + + {{language}} + + +
+ {{details}} +
{% endfor %}
{% endif %} diff --git a/_includes/skills.html b/_includes/skills.html index 2314c148..4197081b 100644 --- a/_includes/skills.html +++ b/_includes/skills.html @@ -1,10 +1,10 @@ {% assign skills = site.data.skills %}
- {% for skill_cat in skills %} + {% for skill_cat in skills %} {% assign title = skill_cat.title[site.lang]%} -
{{title}}
- {% for skill in skill_cat.list %} -
{{skill}}
- {% endfor %} +
{{title}}
+ {% for skill in skill_cat.list %} +
{{skill}}
{% endfor %} + {% endfor %}
diff --git a/_layouts/default.html b/_layouts/default.html index 55627b8c..3b5bf3d4 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,10 +1,8 @@ -{% assign data = site.data.data %} -{% assign lang = site.translations[site.lang].lang %} -{% include head.html %} + {% include head.html %} - {{content}} + {{content}} {% include scripts.html %}