Auto-commit 2024-12-15

9 files changed, 43 insertions, 15 deletions

diff --git a/layouts/_default/_markup/render-codeblock-mermaid.html b/layouts/_default/_markup/render-codeblock-mermaid.html
new file mode 100644
index 0000000..d32626f
--- /dev/null
+++ b/layouts/_default/_markup/render-codeblock-mermaid.html
@@ -0,0 +1,4 @@
+<pre class="mermaid">
+    {{- .Inner | htmlEscape | safeHTML }}
+</pre>
+{{ .Page.Store.Set "hasMermaid" true }} 
\ No newline at end of file
diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 93e530d..b2ccc08 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,3 +1,5 @@
+<figure class="figure">
+
 <img 
     class="d-block img-fluid mb-2 rounded border shadow"
     max-width="800"
@@ -6,3 +8,6 @@
     {{- with .Text }} alt="{{ . }}"{{ end -}}
     {{- with .Title }} title="{{ . }}"{{ end -}}
 >
+{{- with .Title }}<figcaption class="figure-caption">{{.}}</figcaption>{{end -}}
+
+</figure>
\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 313ce06..289d824 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -14,4 +14,10 @@
     {{ block "main" . }}{{ end }}
     {{ partial "footer.html" . }}
 </body>
+{{ if .Store.Get "hasMermaid" }}
+  <script type="module">
+    import mermaid from '/js/mermaid.esm.min.mjs';
+    mermaid.initialize({ startOnLoad: true });
+  </script>
+{{ end }}
 </html>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3838be6..d2ac395 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,11 +2,15 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                <cite>2007—{{ now.Year }} Александр NeonXP Кирюхин. г.Казань</cite>
+                <ul class="list-unstyled">
+                    <li><cite>2007—{{ now.Year }}</cite></li>
+                    <li><cite></cite>Александр NeonXP Кирюхин</cite></li>
+                    <li><cite>г.Казань</cite></li>
+                </ul>
             </div>
-            <div class="col">
+            <div class="col d-flex justify-content-center">
                 {{ with .GitInfo }}
-                    <ul class="list-unstyled float-end">
+                    <ul class="list-unstyled">
                         <li>Коммит: {{ .AbbreviatedHash }}</li>
                         <li>Дата: {{ .AuthorDate.Format "2006-01-02" }}</li>
                     </ul>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e477a29..a83b604 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,6 +1,9 @@
-<nav class="navbar navbar-expand-lg bg-dark" data-bs-theme="dark">
+<nav class="navbar navbar-expand-lg bg-dark fixed-top" data-bs-theme="dark">
     <div class="container">
-      <a class="navbar-brand" href="/">{{ .Site.Title }}</a>
+      <a class="navbar-brand" href="/">
+        <img src="{{ .Site.Params.Logo }}" alt="{{ .Site.Title }}" width="32" height="32">
+        {{ .Site.Title }}
+      </a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
       </button>
@@ -9,4 +12,4 @@
       </div>
     </div>
 </nav>
-</ul>
\ No newline at end of file
+<div class="navbar-filler"></div>
\ No newline at end of file
diff --git a/layouts/partials/list.html b/layouts/partials/list.html
index 7c17687..8106fba 100644
--- a/layouts/partials/list.html
+++ b/layouts/partials/list.html
@@ -21,10 +21,12 @@
             </div>
         {{ end }}
     {{ end }}
+    {{ if .Params.Tags }}
     <div class="p-tags">
         {{ partial "icon.html" "tag" }}
         {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
     </div>
+    {{ end }}
     {{ if .Params.Location }}
     <div class="p-location">
         {{ partial "icon.html" "location" }}
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index f30e72c..8b8e319 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -35,22 +35,22 @@
     {{- with .First }}
       {{- if ne $currentPageNumber .PageNumber }}
       <li class="page-item">
-        <a href="{{ .URL }}" aria-label="First" class="page-link"><span aria-hidden="true">&lAarr;</span></a>
+        <a href="{{ .URL }}" aria-label="First" class="page-link"><span aria-hidden="true">Новые</span></a>
       </li>
       {{- else }}
       <li class="page-item disabled">
-        <a aria-disabled="true" aria-label="First" class="page-link" tabindex="-1"><span aria-hidden="true">&lAarr;</span></a>
+        <a aria-disabled="true" aria-label="First" class="page-link" tabindex="-1"><span aria-hidden="true">Новые</span></a>
       </li>
       {{- end }}
     {{- end }}
 
     {{- with .Prev }}
       <li class="page-item">
-        <a href="{{ .URL }}" aria-label="Previous" class="page-link"><span aria-hidden="true">&larr;</span></a>
+        <a href="{{ .URL }}" aria-label="Previous" class="page-link"><span aria-hidden="true">Новее</span></a>
       </li>
     {{- else }}
       <li class="page-item disabled">
-        <a aria-disabled="true" aria-label="Previous" class="page-link" tabindex="-1"><span aria-hidden="true">&larr;</span></a>
+        <a aria-disabled="true" aria-label="Previous" class="page-link" tabindex="-1"><span aria-hidden="true">Новее</span></a>
       </li>
     {{- end }}
 
@@ -75,22 +75,22 @@
 
     {{- with .Next }}
       <li class="page-item">
-        <a href="{{ .URL }}" aria-label="Next" class="page-link"><span aria-hidden="true">&rarr;</span></a>
+        <a href="{{ .URL }}" aria-label="Next" class="page-link"><span aria-hidden="true">Старее</span></a>
       </li>
     {{- else }}
       <li class="page-item disabled">
-        <a aria-disabled="true" aria-label="Next" class="page-link" tabindex="-1"><span aria-hidden="true">&rarr;</span></a>
+        <a aria-disabled="true" aria-label="Next" class="page-link" tabindex="-1"><span aria-hidden="true">Старее</span></a>
       </li>
     {{- end }}
 
     {{- with .Last }}
       {{- if ne $currentPageNumber .PageNumber }}
       <li class="page-item">
-        <a href="{{ .URL }}" aria-label="Last" class="page-link"><span aria-hidden="true">&rAarr;</span></a>
+        <a href="{{ .URL }}" aria-label="Last" class="page-link"><span aria-hidden="true">Старые</span></a>
       </li>
       {{- else }}
       <li class="page-item disabled">
-        <a aria-disabled="true" aria-label="Last" class="page-link" tabindex="-1"><span aria-hidden="true">&rAarr;</span></a>
+        <a aria-disabled="true" aria-label="Last" class="page-link" tabindex="-1"><span aria-hidden="true">Старые</span></a>
       </li>
       {{- end }}
     {{- end }}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index c0f397a..61826cd 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -1,9 +1,11 @@
 <footer class="post-footer">
     <div class="row between-xs">
+        {{ if .Params.Tags }}
         <div class="p-tags">
             {{ partial "icon.html" "tag" }}
             {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
         </div>
+        {{ end }}
 
         {{ if .Params.Location }}
         <div class="p-location">
diff --git a/layouts/partials/terms.html b/layouts/partials/terms.html
index 9802a11..e52211b 100644
--- a/layouts/partials/terms.html
+++ b/layouts/partials/terms.html
@@ -4,6 +4,8 @@
 {{- with $page.GetTerms $taxonomy }}
   {{- $label := (index . 0).Parent.LinkTitle }}
       {{- range . }}
-        <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>&nbsp;
+        <a class="badge text-bg-secondary" href="{{ .RelPermalink }}">
+          {{ .LinkTitle }}
+        </a>&nbsp;
       {{- end }}
 {{- end }}