From 89ea91a55647f6649a4f62f574458ca96c4cae4f Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Fri, 30 Aug 2019 11:37:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_assets/index/social.scss   |  6 ++---
 source/_assets/index/style.scss    | 37 ++++++++++++++----------------
 source/_includes/article_list.twig | 20 ++++++++++++++++
 source/articles.html.twig          | 31 +------------------------
 source/index.html.twig             | 28 ++++++----------------
 5 files changed, 48 insertions(+), 74 deletions(-)
 create mode 100644 source/_includes/article_list.twig

diff --git a/source/_assets/index/social.scss b/source/_assets/index/social.scss
index bc5fe50..acc5da1 100644
--- a/source/_assets/index/social.scss
+++ b/source/_assets/index/social.scss
@@ -1,14 +1,14 @@
 .social {
     list-style: none;
     padding: 0;
-    margin: 3em 0;
+    margin: 2.4em 0;
     display: block;
-    text-align: center;
+    text-align: left;
 
     &__item {
         display: inline-block;
         margin: 0.25em 0.5em;
-        font-size: 180%;
+        font-size: 120%;
     }
 
     &__link {
diff --git a/source/_assets/index/style.scss b/source/_assets/index/style.scss
index e1b723e..534b95d 100644
--- a/source/_assets/index/style.scss
+++ b/source/_assets/index/style.scss
@@ -14,27 +14,24 @@
     }
 
     @import 'social';
-}
 
-.hello {
-    margin-top: 1em;
-    font-size: 3.4em;
-    margin-bottom: 0.3em;
-    font-weight: normal;
+    .name {
+        margin-top: 0.6em;
+        font-size: 2.4em;
+        margin-bottom: 0.3em;
+        font-weight: bold;
 
-    @media (max-width: $first-media-step) {
-        margin-top: $mobile-margin;
+        @media (max-width: $first-media-step) {
+            margin-top: $mobile-margin;
+        }
+    }
+
+    .info {
+        margin-top: 0;
+        margin-bottom: 0.8em;
+    }
+
+    .year-title {
+        font-weight: bold;
     }
 }
-
-.heading {
-    margin-top: 2.3em;
-    margin-bottom: 0.4em;
-    font-size: 1.2em;
-    font-weight: normal;
-}
-
-.text {
-    margin-top: 0;
-    margin-bottom: 0.8em;
-}
diff --git a/source/_includes/article_list.twig b/source/_includes/article_list.twig
new file mode 100644
index 0000000..09d7634
--- /dev/null
+++ b/source/_includes/article_list.twig
@@ -0,0 +1,20 @@
+{% for year in 2010..2030 %}
+
+  {% set items = [] %}
+
+  {% for article in data.articles %}
+    {% if article.date|date('Y') == year %}
+      {% set items = items|merge([article]) %}
+    {% endif %}
+  {% endfor %}
+
+  {% if items %}
+    <h2 class="year-title">{{ year }}</h2>
+    {% for article in items %}
+      <h3 class="article-title">
+        <a href="{{ article.url }}">{{ article.title }}</a>
+      </h3>
+    {% endfor %}
+  {% endif %}
+
+{% endfor %}
diff --git a/source/articles.html.twig b/source/articles.html.twig
index 864183b..5515e50 100644
--- a/source/articles.html.twig
+++ b/source/articles.html.twig
@@ -6,35 +6,6 @@ use: [articles]
 ---
 {% block content %}
 
-  <h1>{{ page.title }}</h1>
-
-  {% for year in 2010..2030 %}
-
-    {% set items = [] %}
-
-    {% for article in data.articles %}
-      {% if article.date|date('Y') == year %}
-        {% set items = items|merge([article]) %}
-      {% endif %}
-    {% endfor %}
-
-    {% if items %}
-      <h2>{{ year }}</h2>
-      <ul>
-        {% for article in items %}
-          <li>
-            <p>
-              <a href="{{ article.url }}">{{ article.title }}</a>
-              {% if article.description %}
-                <br>
-                {{ article.description }}
-              {% endif %}
-            </p>
-          </li>
-        {% endfor %}
-      </ul>
-    {% endif %}
-
-  {% endfor %}
+  {% include 'article_list.twig' %}
 
 {% endblock %}
diff --git a/source/index.html.twig b/source/index.html.twig
index 66fe2a5..d9f01e1 100644
--- a/source/index.html.twig
+++ b/source/index.html.twig
@@ -18,31 +18,17 @@ use: [articles]
 
   <main class="content">
 
-    <h1 class="hello">Привет,</h1>
+    <h1 class="name">Антов Вахрушев</h1>
 
-    <p class="text">
-      меня зовут Антон Вахрушев, и&nbsp;это моя домашняя страница.
+    <p class="info">
+      Я веб-программист в <a href="https://elama.ru/">eLama</a>. Пишу на PHP.
+      Предпочитаю разработку back-end, экспериментирую с front-end, интересуюсь функциональным программированием.
+      Иногда <a href="/albums">фотографирую</a>.
     </p>
 
-    <h2 class="heading"><a href="/articles/">Заметки</a></h2>
-    <ul>
-      {% for article in data.articles %}
-        <li>
-          <a href="{{ article.url }}">{{ article.title }}</a>
-          <p>{{ article.description }}</p>
-        </li>
-      {% endfor %}
-    </ul>
+    <span class="hr-line"></span>
 
-    <h2 class="heading">Читать</h2>
-    <ul>
-      <li>
-        <a href="/about/">об авторе</a>
-      </li>
-      <li>
-        <a href="/wishlist/">вишлист</a>
-      </li>
-    </ul>
+    {% include 'article_list.twig' %}
 
     <span class="hr-line"></span>