From 68b9e211f9ffa0b876e131eb148d90d412569fdb Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sat, 23 Jun 2018 09:17:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B5=D0=B3=D0=B8=20description?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_includes/head.twig                | 22 +++++++++++++++-------
 source/_includes/navigation.twig          |  9 +++++++++
 source/_layouts/internal.html.twig        | 10 +---------
 source/about/me.html.twig                 |  1 +
 source/index.html.twig                    |  1 +
 source/projects/predictor/index.html.twig |  1 +
 source/wishlist.md                        |  1 +
 7 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 source/_includes/navigation.twig

diff --git a/source/_includes/head.twig b/source/_includes/head.twig
index 307b19e..80ff2ae 100644
--- a/source/_includes/head.twig
+++ b/source/_includes/head.twig
@@ -1,11 +1,19 @@
+{# Charset #}
 <meta charset="utf-8">
+
+{# Title #}
+{% if page.title is defined %}
+  <title>{{ page.title }} - {{ site.title }}</title>
+{% else %}
+  <title>{{ site.title }}</title>
+{% endif %}
+
+{# Description #}
+{% if page.description is defined %}
+  <meta name="description" content="{{ page.description }}">
+{% endif %}
+
+{# Other meta fields #}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="yandex-verification" content="eb6443fccb57d7d2" />
 <link href="https://fonts.googleapis.com/css?family=PT+Serif:400,700&amp;subset=cyrillic" rel="stylesheet">
-<title>
-  {% if page.title is defined %}
-    {{ page.title }} - {{ site.title }}
-  {% else %}
-    {{ site.title }}
-  {% endif %}
-</title>
diff --git a/source/_includes/navigation.twig b/source/_includes/navigation.twig
new file mode 100644
index 0000000..bd47053
--- /dev/null
+++ b/source/_includes/navigation.twig
@@ -0,0 +1,9 @@
+<nav class="navigation">
+  <ul class="navigation__actions">
+    <li class="navigation__action">
+      <a class="navigation__link" href="/">
+        Главная
+      </a>
+    </li>
+  </ul>
+</nav>
diff --git a/source/_layouts/internal.html.twig b/source/_layouts/internal.html.twig
index dde92ec..e6ecf05 100644
--- a/source/_layouts/internal.html.twig
+++ b/source/_layouts/internal.html.twig
@@ -7,15 +7,7 @@
 
   <div class="page">
 
-    <nav class="navigation">
-      <ul class="navigation__actions">
-        <li class="navigation__action">
-          <a class="navigation__link" href="/">
-            Главная
-          </a>
-        </li>
-      </ul>
-    </nav>
+    {% include 'navigation.twig' %}
 
     <main class="content">
       {% block content %}{% endblock %}
diff --git a/source/about/me.html.twig b/source/about/me.html.twig
index 918dea5..616cdc3 100644
--- a/source/about/me.html.twig
+++ b/source/about/me.html.twig
@@ -1,6 +1,7 @@
 ---
 layout: internal
 title: Обо мне
+description: Несколько фактов об авторе
 ---
 
 {% block js %}
diff --git a/source/index.html.twig b/source/index.html.twig
index 20e282d..5857dfe 100644
--- a/source/index.html.twig
+++ b/source/index.html.twig
@@ -1,5 +1,6 @@
 ---
 layout: default
+description: Личный сайт Антона Вахрушева
 ---
 {% block content %}
   <h1 class="hello">Привет,</h1>
diff --git a/source/projects/predictor/index.html.twig b/source/projects/predictor/index.html.twig
index ea7385f..b5c13f5 100644
--- a/source/projects/predictor/index.html.twig
+++ b/source/projects/predictor/index.html.twig
@@ -1,6 +1,7 @@
 ---
 layout: internal
 title: Гадалка
+description: Демо-версия электронной гадалки Шеннона
 ---
 
 {% block js %}
diff --git a/source/wishlist.md b/source/wishlist.md
index 86d7130..d4cb55e 100644
--- a/source/wishlist.md
+++ b/source/wishlist.md
@@ -1,6 +1,7 @@
 ---
 layout: internal
 title: Вишлист
+description: Список вещей, которые можно подарить
 ---
 
 # Вишлист