diff --git a/source/404.md b/source/404.md index 8436175..dc84795 100644 --- a/source/404.md +++ b/source/404.md @@ -1,9 +1,9 @@ --- -layout: default +layout: internal title: Страница не найдена description: Станица не найдена styles: - - /static/index.css + - /static/index.css --- # 404 diff --git a/source/_assets/components/social.scss b/source/_assets/components/social.scss index 1e06137..bc5fe50 100644 --- a/source/_assets/components/social.scss +++ b/source/_assets/components/social.scss @@ -7,7 +7,7 @@ &__item { display: inline-block; - margin: 0 0.5em; + margin: 0.25em 0.5em; font-size: 180%; } diff --git a/source/_assets/index/index.js b/source/_assets/index/index.js deleted file mode 100644 index 5baf72e..0000000 --- a/source/_assets/index/index.js +++ /dev/null @@ -1 +0,0 @@ -import '../components/social.scss'; diff --git a/source/_assets/layout_default/style.scss b/source/_assets/index/style.scss similarity index 94% rename from source/_assets/layout_default/style.scss rename to source/_assets/index/style.scss index 170783f..4dc50a7 100644 --- a/source/_assets/layout_default/style.scss +++ b/source/_assets/index/style.scss @@ -12,6 +12,8 @@ right: $mobile-margin; } } + + @import '../components/social'; } .hello { diff --git a/source/_layouts/base.html.twig b/source/_layouts/base.html.twig index ca9c424..e37ed4b 100644 --- a/source/_layouts/base.html.twig +++ b/source/_layouts/base.html.twig @@ -11,7 +11,7 @@
{# block for main page content #} - {% block page_conent %}{% endblock page_conent %} + {% block page_content %}{% endblock page_content %} {# Analytics counters #} {% include 'counters.twig' %} diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig deleted file mode 100644 index 8adb374..0000000 --- a/source/_layouts/default.html.twig +++ /dev/null @@ -1,17 +0,0 @@ -{% extends 'base.html.twig' %} - -{% block css %} - {{ parent() }} - -{% endblock %} - -{% block js %} - {{ parent() }} - -{% endblock %} - -{% block page_conent %} -
- {% block content %}{% endblock %} -
-{% endblock %} diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig index 347c4dd..f41223c 100644 --- a/source/_layouts/internal.html.twig +++ b/source/_layouts/internal.html.twig @@ -10,7 +10,7 @@ {% endblock %} -{% block page_conent %} +{% block page_content %}
{% include 'navigation.twig' %} {% block main %} diff --git a/source/index.html.twig b/source/index.html.twig index d904b8b..66fe2a5 100644 --- a/source/index.html.twig +++ b/source/index.html.twig @@ -1,68 +1,79 @@ --- -layout: default +layout: base description: Личный сайт Антона Вахрушева use: [articles] --- + {% block css %} {{ parent() }} {% endblock %} -{% block content %} -

Привет,

+{% block js %} + {{ parent() }} + +{% endblock %} -

- меня зовут Антон Вахрушев, и это моя домашняя страница. -

+{% block page_content %} -

Заметки

- -

Читать

- + - + - + {% endblock %}