10 files changed, 70 insertions, 92 deletions
diff --git a/themes/neonxp/layouts/_default/home.html b/themes/neonxp/layouts/_default/home.html
index 0df6597..9d97e21 100644
--- a/themes/neonxp/layouts/_default/home.html
+++ b/themes/neonxp/layouts/_default/home.html
@@ -1,7 +1,26 @@
 {{ define "main" }}
-  {{ .Content }}
-  {{ range site.RegularPages }}
-    <h2><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2>
-    {{ .Summary }}
-  {{ end }}
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar">
+        <article>
+            <header>Навигатор</header>
+            {{ partial "menu.html" (dict "menuID" "sections" "page" .) }}
+        </article>
+    </div>
+    <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8">
+        <article>
+          <header class="p-name">
+              {{ .Title }}
+          </header>
+          <div class="e-content">
+            {{ .Content }}
+          </div>
+        </article>
+        {{ $pages := where site.RegularPages "Type" "posts" }}
+        {{ $paginator := .Paginate $pages 7 }}
+        {{ range $paginator.Pages }}
+        {{ partial "list.html" . }}
+        {{ end }}
+        <nav>{{ partial "pagination.html" . }}</nav>
+    </div>
+</div>
 {{ end }}
diff --git a/themes/neonxp/layouts/_default/list.html b/themes/neonxp/layouts/_default/list.html
index 065ee1a..6a399e7 100644
--- a/themes/neonxp/layouts/_default/list.html
+++ b/themes/neonxp/layouts/_default/list.html
@@ -1,19 +1,18 @@
 {{ define "main" }}
-<div class="single-page">
-    <div class="sidebar">
-        <article class="toc">
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar">
+        <article>
             <header>Навигатор</header>
             {{ partial "menu.html" (dict "menuID" "sections" "page" .) }}
         </article>
     </div>
-    <div class="h-entry">
+    <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8">
         {{ if .Title }}
         <article>
             <header>{{ .Title }}</header>
             {{ .Content }}
         </article>
         {{ end }}
-        <h1>Страницы:</h1>
         {{ $paginator := .Paginate .Pages 7 }}
         {{ range $paginator.Pages }}
         {{ partial "list.html" . }}
diff --git a/themes/neonxp/layouts/_default/single.html b/themes/neonxp/layouts/_default/single.html
index 8a7b707..1508d26 100644
--- a/themes/neonxp/layouts/_default/single.html
+++ b/themes/neonxp/layouts/_default/single.html
@@ -1,52 +1,38 @@
 {{ define "main" }}
-<div class="single-page">
-    <div class="sidebar">
-      <div class="toc">
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar">
         {{ if .Params.toc }}
-          <article>
-              <header>Содержание</header>
-              <aside>{{ .TableOfContents }}</aside>
-          </article>
-        {{ end }}
         <article>
-          <header>Разделы</header>
-          {{ partial "menu.html" (dict "menuID" "sections" "page" .) }}
+            <header>Содержание</header>
+            <aside>{{ .TableOfContents }}</aside>
+        </article>
+      {{ end }}
+        <article>
+            <header>Навигатор</header>
+            {{ partial "menu.html" (dict "menuID" "sections" "page" .) }}
         </article>
-      </div>
     </div>
-    <div class="h-entry">
+    <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8">
         <article>
             <header class="space-between">
-                <span class="p-name">
-                  {{ .Title }}
-                </span>
+                <span class="p-name"> {{ .Title }} </span>
                 {{ if .Date }} 
-                {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} 
-                {{ $dateHuman := .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") }}
-                <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
+                  {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} 
+                  {{ $dateHuman := .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") }}
+                  <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time>
                 {{ end }}
             </header>
-            <div class="p-summary">
-              {{ .Summary }}
-            </div>
-            <div class="e-content">
-              {{ .Content }}
-            </div>
+            <div class="p-summary">{{ .Summary }}</div>
+            <div class="e-content">{{ .Content }}</div>
             <footer class="space-between">
                 <span>
-                {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
+                    {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
                 </span>
 
                 <a class="u-url" href="{{ .Permalink }}">#</a>
-                
-                {{ if .Params.Location }}
-                  <span class="p-location">@ {{.Params.Location}}</span>
-                {{ end }}
 
-                {{ if .Lastmod }}
-                  {{ $dateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }}
-                  {{ $dateHuman := .Lastmod | time.Format (or .Site.Params.dateFormat.lastUpdated "Jan 02, 2006") }}
-                  <time class="dt-updated" datetime="{{ $dateMachine }}">Изм: {{ $dateHuman }}</time>
+                {{ if .Params.Location }}
+                <span class="p-location">@ {{.Params.Location}}</span>
                 {{ end }}
             </footer>
         </article>
diff --git a/themes/neonxp/layouts/index.html b/themes/neonxp/layouts/index.html
deleted file mode 100644
index f92bc7f..0000000
--- a/themes/neonxp/layouts/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{{ define "main" }}
-<div class="single-page">
-    <div class="sidebar">
-        <article class="toc">
-            <header>Навигатор</header>
-            {{ partial "menu.html" (dict "menuID" "sections" "page" .) }}
-        </article>
-    </div>
-    <div class="h-entry">
-        <article>
-            <header class="p-name">
-                {{ .Title }}
-            </header>
-            <div class="p-summary">
-                {{ .Summary }}
-              </div>
-              <div class="e-content">
-                {{ .Content }}
-              </div>
-        </article>
-        <h1>Блог</h1>
-        {{ $pages := where site.RegularPages "Type" "posts" }}
-        {{ $paginator := .Paginate $pages 7 }}
-        {{ range $paginator.Pages }}
-        {{ partial "list.html" . }}
-        {{ end }}
-        <nav>{{ partial "pagination.html" . }}</nav>
-    </div>
-</div>
-{{ end }}
diff --git a/themes/neonxp/layouts/partials/comments.html b/themes/neonxp/layouts/partials/comments.html
index c01c3b7..77b4410 100644
--- a/themes/neonxp/layouts/partials/comments.html
+++ b/themes/neonxp/layouts/partials/comments.html
@@ -1,5 +1,5 @@
 {{- with .Site.Params.comments -}}
-<article>
+<article class="comments">
     <header>Комментарии</header>
     <div id="remark42"></div>
 </article>
diff --git a/themes/neonxp/layouts/partials/footer.html b/themes/neonxp/layouts/partials/footer.html
index a68920c..f520850 100644
--- a/themes/neonxp/layouts/partials/footer.html
+++ b/themes/neonxp/layouts/partials/footer.html
@@ -1,19 +1,12 @@
 <nav>
     <ul>
         <li>
-            <cite>2007—{{ now.Year }}</cite>
-        </li>
-        <li>
-            <cite> Александр NeonXP Кирюхин. </cite>
-        </li>
-        <li>
-            <cite>г.Казань</cite>
+            <cite>2007—{{ now.Year }} Александр NeonXP Кирюхин. г.Казань</cite>
         </li>
     </ul>
-
     <ul>
-        <li><a href="https://git.neonxp.ru/neonxp/blog">Исходный код</a>.</li>
-        <li><a href="mailto:i@neonxp.ru" rel="me">Электропочта</a>.</li>
-        <li><a href="https://neonxp.ru/posts/index.xml">РСС</a>.</li>
+        <li><a href="https://git.neonxp.ru/neonxp/blog">Исходный код</a></li>
+        <li><a href="mailto:i@neonxp.ru" rel="me">Электропочта</a></li>
+        <li><a href="https://neonxp.ru/posts/index.xml">РСС</a></li>
     </ul>
 </nav>
diff --git a/themes/neonxp/layouts/partials/head.html b/themes/neonxp/layouts/partials/head.html
index 119b138..6731ae0 100644
--- a/themes/neonxp/layouts/partials/head.html
+++ b/themes/neonxp/layouts/partials/head.html
@@ -3,7 +3,7 @@
 <link rel="icon" type="image/png" href="/favicon.png">
 <link rel="authorization_endpoint" href="https://indieauth.com/auth">
 <link rel="token_endpoint" href="https://tokens.indieauth.com/token">
-<link rel="micropub" href="https://eo7kjtzrfq0v1s2.m.pipedream.net/micropub">
+<link rel="micropub" href="https://neonxp.ru/micropub">
 <title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title>
 {{ partialCached "head/css.html" . }}
 {{ partialCached "head/js.html" . }}
diff --git a/themes/neonxp/layouts/partials/head/css.html b/themes/neonxp/layouts/partials/head/css.html
index 09e7397..c0dc59e 100644
--- a/themes/neonxp/layouts/partials/head/css.html
+++ b/themes/neonxp/layouts/partials/head/css.html
@@ -7,6 +7,15 @@
     {{- end }}
   {{- end }}
 {{- end }}
+{{- with resources.Get "css/flexboxgrid.min.css" }}
+  {{- if eq hugo.Environment "development" }}
+    <link rel="stylesheet" href="{{ .RelPermalink }}">
+  {{- else }}
+    {{- with . | minify | fingerprint }}
+      <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+    {{- end }}
+  {{- end }}
+{{- end }}
 {{- with resources.Get "css/syntax.css" }}
   {{- if eq hugo.Environment "development" }}
     <link rel="stylesheet" href="{{ .RelPermalink }}">
diff --git a/themes/neonxp/layouts/partials/list.html b/themes/neonxp/layouts/partials/list.html
index 3b1bacc..72d546c 100644
--- a/themes/neonxp/layouts/partials/list.html
+++ b/themes/neonxp/layouts/partials/list.html
@@ -3,7 +3,7 @@
         <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
         {{ if .Date }}
         <span>
-            {{- .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") -}}
+            {{- .Date | time.Format (or .Site.Params.dateFormat.published "02 Jan 2006") -}}
         </span>
         {{ end }}
     </header>
diff --git a/themes/neonxp/layouts/partials/menu.html b/themes/neonxp/layouts/partials/menu.html
index 97f2e1f..c860b4c 100644
--- a/themes/neonxp/layouts/partials/menu.html
+++ b/themes/neonxp/layouts/partials/menu.html
@@ -12,9 +12,11 @@ Renders a menu for the given menu ID.
 
 {{- with index site.Menus $menuID }}
   <aside>
-    <ul>
-      {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
-    </ul>
+    <nav>
+      <ol>
+        {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
+      </ol>
+    </nav>
   </aside>
 {{- end }}
 
@@ -42,9 +44,9 @@ Renders a menu for the given menu ID.
         {{- end -}}
       >{{ $name }}</a>
       {{- with .Children }}
-        <ul>
+        <ol>
           {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }}
-        </ul>
+        </ol>
       {{- end }}
     </li>
   {{- end }}