Добавлен базовый лейоут

This commit is contained in:
Anton Vakhrushev 2019-08-23 17:24:06 +03:00
parent 8e31f739a5
commit cee1287ddf
7 changed files with 55 additions and 44 deletions

View File

@ -3,6 +3,7 @@ layout: default
description: Личный сайт Антона Вахрушева description: Личный сайт Антона Вахрушева
--- ---
{% block css %} {% block css %}
{{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}">
{% endblock %} {% endblock %}

View File

@ -26,7 +26,7 @@
<meta name="yandex-verification" content="eb6443fccb57d7d2" /> <meta name="yandex-verification" content="eb6443fccb57d7d2" />
{# Social #} {# Social #}
<meta property="og:site_name" content="AntonVakhrushev"> <meta property="og:site_name" content="Anton Vakhrushev">
<meta property="og:title" content="{{ page.og.title ?? page.title ?? site.title }}"> <meta property="og:title" content="{{ page.og.title ?? page.title ?? site.title }}">
<meta property="og:description" content="{{ page.og.description ?? page.description ?? site.description ?? '' }}"> <meta property="og:description" content="{{ page.og.description ?? page.description ?? site.description ?? '' }}">
<meta property="og:url" content="{{ page.og.url ?? (site.url | trim('/', side='right')) ~ (page.url != '/.' ? page.url : '') }}"> <meta property="og:url" content="{{ page.og.url ?? (site.url | trim('/', side='right')) ~ (page.url != '/.' ? page.url : '') }}">

View File

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html lang="ru">
<head>
{% include 'head.twig' %}
{% block css %}{% endblock %}
{% for s in page.styles | default([]) %}
<link rel="stylesheet" href="{{ hashed_asset(s) }}">
{% endfor %}
</head>
<body>
{% 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([]) %}
<script async src="{{ hashed_asset(s) }}"></script>
{% endfor %}
{# Extra fonts #}
{% include 'font-awesome.twig' %}
</body>
</html>

View File

@ -1,23 +1,17 @@
<!DOCTYPE html> {% extends 'base.html.twig' %}
<html>
<head> {% block css %}
{% include 'head.twig' %} {{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/layout_default.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/layout_default.css') }}">
{% block css %}{% endblock %} {% endblock %}
</head>
<body>
{% include 'adv.twig' %} {% block js %}
{{ parent() }}
<script async src="{{ hashed_asset('/static/layout_default.js') }}"></script>
{% endblock %}
{% block page_conent %}
<main class="content"> <main class="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</main> </main>
{% endblock %}
{% include 'counters.twig' %}
<script async src="{{ hashed_asset('/static/layout_default.js') }}"></script>
{% block js %}{% endblock %}
{% include 'font-awesome.twig' %}
</body>
</html>

View File

@ -1,37 +1,22 @@
<!DOCTYPE html> {% extends 'base.html.twig' %}
<html>
<head> {% block css %}
{% include 'head.twig' %} {{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/layout_internal.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/layout_internal.css') }}">
{% block css %}{% endblock %} {% endblock %}
{% for s in page.styles | default([]) %}
<link rel="stylesheet" href="{{ hashed_asset(s) }}">
{% endfor %}
</head>
<body>
{% include 'adv.twig' %} {% block js %}
{{ parent() }}
<script async src="{{ hashed_asset('/static/layout_internal.js') }}"></script>
{% endblock %}
{% block page_conent %}
<div class="page"> <div class="page">
{% include 'navigation.twig' %} {% include 'navigation.twig' %}
{% block main %} {% block main %}
<main class="content"> <main class="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</main> </main>
{% endblock %} {% endblock %}
</div> </div>
{% endblock %}
{% include 'counters.twig' %}
<script async src="{{ hashed_asset('/static/layout_internal.js') }}"></script>
{% block js %}{% endblock %}
{% for s in page.scripts | default([]) %}
<script async src="{{ hashed_asset(s) }}"></script>
{% endfor %}
{% include 'font-awesome.twig' %}
</body>
</html>

View File

@ -5,10 +5,12 @@ description: Несколько фактов об авторе
--- ---
{% block js %} {% block js %}
{{ parent() }}
<script async src="{{ hashed_asset('/static/about.js') }}"></script> <script async src="{{ hashed_asset('/static/about.js') }}"></script>
{% endblock %} {% endblock %}
{% block css %} {% block css %}
{{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/about.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/about.css') }}">
{% endblock %} {% endblock %}

View File

@ -4,6 +4,7 @@ description: Личный сайт Антона Вахрушева
use: [articles] use: [articles]
--- ---
{% block css %} {% block css %}
{{ parent() }}
<link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}"> <link rel="stylesheet" href="{{ hashed_asset('/static/index.css') }}">
{% endblock %} {% endblock %}