diff --git a/_layouts/about.html b/_layouts/about.html index ded8a6c..9ac234e 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -1,32 +1,44 @@ --- -layout: page +layout: default --- -
-
- {{ content }} -
- {% if page.profile %} -
- {% if page.profile.image %} - - {% endif %} - {% if page.profile.address %} -
- {{ page.profile.address }} +
+ +
+ {% assign name = site.title | split: ' ' %} +

{{ name | first }} {{ name | last }}

+

{{ page.description }}

+
+ +
+
+
+ {{ content }} +
+ {% if page.profile %} +
+ {% if page.profile.image %} + + {% endif %} + {% if page.profile.address %} +
+ {{ page.profile.address }} +
+ {% endif %}
- {% endif %} + {% endif %} +
+ + {% if page.news %} + {% include news.html %} + {% endif %} + + {% if page.social %} + {% endif %} -
+ -{% if page.news %} - {% include news.html %} -{% endif %} - -{% if page.social %} - -{% endif %} diff --git a/_layouts/page.html b/_layouts/page.html index e474e9b..10b9ab4 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,12 +4,7 @@ layout: default
- {% if page.title == 'about' %} - {% assign name = site.title | split: ' ' %} -

{{ name | first }} {{ name | last }}

- {% else %}

{{ page.title }}

- {% endif %}

{{ page.description }}