diff --git a/source/404.html.twig b/source/404.html.twig index 72667e6..23e9fab 100644 --- a/source/404.html.twig +++ b/source/404.html.twig @@ -3,6 +3,7 @@ layout: default description: Личный сайт Антона Вахрушева --- {% block css %} + {{ parent() }} {% endblock %} diff --git a/source/_includes/head.twig b/source/_includes/head.twig index 60a84c9..692b3fe 100644 --- a/source/_includes/head.twig +++ b/source/_includes/head.twig @@ -26,7 +26,7 @@ {# Social #} - + diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig new file mode 100644 index 0000000..9227f67 --- /dev/null +++ b/source/_layouts/base.html.twig @@ -0,0 +1,28 @@ + + + + {% include 'head.twig' %} + {% block css %}{% endblock %} + {% for s in page.styles | default([]) %} + + {% endfor %} + + + {% include 'adv.twig' %} + + {# block for main page content #} + {% block page_conent %}{% endblock page_conent %} + + {# Analytics counters #} + {% include 'counters.twig' %} + + {# Scripts #} + {% block js %}{% endblock %} + {% for s in page.scripts | default([]) %} + + {% endfor %} + + {# Extra fonts #} + {% include 'font-awesome.twig' %} + + diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig index d863786..8adb374 100644 --- a/source/_layouts/default.html.twig +++ b/source/_layouts/default.html.twig @@ -1,23 +1,17 @@ - - - - {% include 'head.twig' %} +{% extends 'base.html.twig' %} + +{% block css %} + {{ parent() }} - {% block css %}{% endblock %} - - +{% endblock %} - {% include 'adv.twig' %} +{% block js %} + {{ parent() }} + +{% endblock %} +{% block page_conent %}
{% block content %}{% endblock %}
- - {% include 'counters.twig' %} - - - {% block js %}{% endblock %} - - {% include 'font-awesome.twig' %} - - +{% endblock %} diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig index cbd0c6c..347c4dd 100644 --- a/source/_layouts/internal.html.twig +++ b/source/_layouts/internal.html.twig @@ -1,37 +1,22 @@ - - - - {% include 'head.twig' %} +{% extends 'base.html.twig' %} + +{% block css %} + {{ parent() }} - {% block css %}{% endblock %} - {% for s in page.styles | default([]) %} - - {% endfor %} - - +{% endblock %} - {% include 'adv.twig' %} +{% block js %} + {{ parent() }} + +{% endblock %} +{% block page_conent %}
- {% include 'navigation.twig' %} - {% block main %}
{% block content %}{% endblock %}
{% endblock %} -
- - {% include 'counters.twig' %} - - - {% block js %}{% endblock %} - {% for s in page.scripts | default([]) %} - - {% endfor %} - - {% include 'font-awesome.twig' %} - - +{% endblock %} diff --git a/source/about.html.twig b/source/about.html.twig index c0e634f..7e2b2d6 100644 --- a/source/about.html.twig +++ b/source/about.html.twig @@ -5,10 +5,12 @@ description: Несколько фактов об авторе --- {% block js %} + {{ parent() }} {% endblock %} {% block css %} + {{ parent() }} {% endblock %} diff --git a/source/index.html.twig b/source/index.html.twig index 96a2e99..d904b8b 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -4,6 +4,7 @@ description: Личный сайт Антона Вахрушева use: [articles] --- {% block css %} + {{ parent() }} {% endblock %}