wunsh · araslanov-e · Jul 25, 2018 · Jul 25, 2018
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 .idea
 _site
 Gemfile.lock
+.ruby-gemset
+.ruby-version
diff --git a/_includes/footer.html b/_includes/footer.html
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,18 +1,19 @@
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>{% if page.title %}{{ page.title | strip_html }} |> {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
-    <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
+  <title>{% if page.title %}{{ page.title | strip_html }} |> {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
+  <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 
-    <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | prepend: site.baseurl }}" />
-    <link rel="canonical" href="{{ page.url | replace:'index.html', '' | prepend: site.baseurl | prepend: site.url }}">
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | prepend: site.baseurl }}" />
+  <link rel="canonical" href="{{ page.url | replace:'index.html', '' | prepend: site.baseurl | prepend: site.url }}">
 
-    <style type="text/css">@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700&subset=cyrillic");</style>
-    <link rel="stylesheet" href="{{ "/assets/css/vendors/pure.min.css" | prepend: site.baseurl }}">
-    <link rel="stylesheet" href="{{ "/assets/css/vendors/pure-grids-responsive.min.css" | prepend: site.baseurl }}">
-    <link rel="stylesheet" href="{{ "/assets/css/style.css?" | prepend: site.baseurl }}{{ site.time | date: "%s" }}">
+  <link rel="stylesheet" href="{{ "/assets/css/vendors/pure.min.css" | prepend: site.baseurl }}">
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/normalize.css">
+  <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/cayman.css">
+  <link rel="stylesheet" href="{{ "/assets/css/style.css?" | prepend: site.baseurl }}{{ site.time | date: "%s" }}">
 
-    <link rel="shortcut icon" type="image/png" href="{{ '/assets/favicon.png' | prepend: site.baseurl }}" >
+  <link rel="shortcut icon" type="image/png" href="{{ '/assets/favicon.png' | prepend: site.baseurl }}" >
 </head>
diff --git a/_includes/header.html b/_includes/header.html
@@ -0,0 +1,14 @@
+{% include global_variables.html %}
+
+{% include header/nav.html %}
+
+<section class="page-header">
+  <h1 class="project-name">
+    {% if first_page %}
+      {{ site.name }}
+    {% else %}
+      <a href="{{ site.url }}" class="" title="На главную">{{ site.name }}</a>
+    {% endif %}
+  </h1>
+  <h2 class="project-tagline">{{ site.home_title }}</h2>
+</section>
diff --git a/_includes/header/nav.html b/_includes/header/nav.html
@@ -0,0 +1,21 @@
+<nav class="nav">
+  <ul class="nav_list">
+    {% for item in site.data.nav %}
+      {% if item.section_id == page.section_id %}
+        {% assign active_class = "active" %}
+      {% else %}
+        {% assign active_class = "" %}
+      {% endif %}
+
+      {% if item.children %}
+        <li class="nav_list__item {{ active_class }}">
+          <a href="{{ site.url }}/{{ item.path }}" data-popover="#{{ item.section_id }}" class="nav_list__item_link">{{ item.name }}</a>
+        </li>
+      {% else %}
+        <li class="nav_list__item {{ active_class }}">
+          <a href="{{ site.url }}/{{ item.path }}" class="nav_list__item_link">{{ item.name }}</a>
+        </li>
+      {% endif %}
+    {% endfor %}
+  </ul>
+</nav>
diff --git a/_includes/intro.html b/_includes/intro.html
diff --git a/_includes/menu.html b/_includes/menu.html
diff --git a/_includes/pagination.html b/_includes/pagination.html
@@ -1,23 +1,23 @@
 {% if paginator.total_pages > 1 %}
   <div class="pagination">
     {% if paginator.previous_page %}
-      <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&laquo; Назад</a>
+      <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&laquo;</a>
     {% else %}
-      <span>&laquo; Назад</span>
+      <span>&laquo;</span>
     {% endif %}
 
     {% for page in (1..paginator.total_pages) %}
       {% if page == paginator.page %}
-        <em>{{ page }}</em>
+        <span class="active">{{ page }}</span>
       {% else %}
         <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
       {% endif %}
     {% endfor %}
 
     {% if paginator.next_page %}
-      <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">Вперёд &raquo;</a>
+      <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">&raquo;</a>
     {% else %}
-      <span>Вперёд &raquo;</span>
+      <span>&raquo;</span>
     {% endif %}
   </div>
 {% endif %}
diff --git a/_includes/post_item.html b/_includes/post_item.html
@@ -0,0 +1,28 @@
+<section class="post_small">
+  <header class="post_small__header">
+    <h3 class="post_small__title">
+      <a href="{{ post.url }}" class="post_small__title_link">
+        {{ post.title }}
+      </a>
+    </h3>
+
+    <div class="post_small__meta">
+      <div class="post_small__date">
+        {% include translated_date.html date=post.date format="%d %B %Y" %}
+      </div>
+    </div>
+  </header>
+
+  <div class="post_small__description">
+    {% if post.cover %}
+      <img width="72" height="72" class="post_small__cover" title="{{ post.title }}" src="{{ post.cover }}">
+    {% endif %}
+    <div class="post_small__text">
+      {{ post.excerpt }}
+    </div>
+  </div>
+
+  <div class="tag_cloud tags_cloud--inline">
+    {% include tags_cloud.html post_tags=post.tags %}
+  </div>
+</section>
diff --git a/_includes/post_list.html b/_includes/post_list.html
diff --git a/_includes/post_main.html b/_includes/post_main.html
diff --git a/_includes/subscribe.html b/_includes/subscribe.html
@@ -0,0 +1,4 @@
+<div class='subscribe'>
+  <a href="#subscribeModal" class="pure-button">Подписаться на рассылку</a>
+</div>
+
diff --git a/_includes/tags_cloud.html b/_includes/tags_cloud.html
@@ -1,7 +1,9 @@
 {% include tags.html %}
 
+{% if tags.size > 1 %}
 <ul class="tags_cloud__list">
   {% for tag in tags %}
     <a href="/tags/#{{ tag | slugify }}" class="tags_cloud__link tag tag--{{ tag | slugify }}">{{ tag }}</a>
   {% endfor %}
 </ul>
+{% endif %}
diff --git a/_includes/tags_page.html b/_includes/tags_page.html
@@ -1,14 +1,13 @@
 {% include tags.html %}
 
-
 <h1>Статьи по тегам</h1>
 
 {% for tag in tags %}
-  <h2 id="{{ tag | slugify }}" class="tag tag--{{ tag }}">{{ tag }}</h2>
-  <ul class="h-simple_list">
+  <h2 id="{{ tag | slugify }}">{{ tag }}</h2>
+  <ul>
     {% for post in site.tags[tag] %}
       <li>
-          <a href="{{ post.url }}" class="h-simple_link">{{ post.title }}</a>
+          <a href="{{ post.url }}">{{ post.title }}</a>
       </li>
     {% endfor %}
   </ul>

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,19 +1,17 @@
 <!DOCTYPE html>
-<html lang="ru">
+<html>
   {% include head.html %}
-
   <body>
-    <div class="wunsh pure-g">
-      {% include menu.html %}
+    {% include header.html %}
+
+    <section class="main-content">
+      {{ content }}
+    </section>
 
-      <div class="content pure-u-1 pure-u-md-3-4">
-        {{ content }}
+    {% include footer.html %}
 
-        {% include footer.html %}
-        {% include modals.html %}
-        {% include scripts.html %}
-        {% include counters.html %}
-      </div>
-    </div>
+    {% include modals.html %}
+    {% include scripts.html %}
+    {% include counters.html %}
   </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -5,38 +5,27 @@
 
 <div class="home">
   {% if first_page %}
-    <div class="posts home__section">
+    <div class="posts home__section best_post">
       <h2 class="content__subhead">Самое интересное</h2>
 
-      {% assign main_post = site.categories["articles"].first %}
-
-      {% include post_main.html post=main_post %}
-    </div>
-  {% endif %}
-
-  {% if first_page %}
-    <div class="home__section">
-      {% include intro.html %}
+      {% assign post = site.categories["articles"].first %}
+      {% include post_item.html %}
     </div>
   {% endif %}
 
   <div class="posts home__section">
     <h2 class="content__subhead">Новые посты</h2>
 
     {% for post in paginator.posts limit: (per_page - offset) offset: offset %}
-      {% include post_list.html post=post %}
+      {% include post_item.html %}
     {% endfor %}
   </div>
 
   <div class="home__section">
     {% include pagination.html %}
   </div>
 
-  <div class="home__section tags_cloud tags_cloud--colorless">
+  <div class="home__section tags_cloud">
     {% include tags_cloud.html %}
   </div>
-
-  <div class="home__section">
-    <h1 class="home__title">{{ site.home_title }}</h1>
-  </div>
 </div>