Auto-commit 2024-12-15

5 files changed, 17 insertions, 12 deletions

diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index b2ccc08..3d15a11 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,5 +1,5 @@
 <figure class="figure">
-
+<a href="{{ .Destination | safeURL }}">
 <img 
     class="d-block img-fluid mb-2 rounded border shadow"
     max-width="800"
@@ -8,6 +8,7 @@
     {{- with .Text }} alt="{{ . }}"{{ end -}}
     {{- with .Title }} title="{{ . }}"{{ end -}}
 >
+</a>
 {{- with .Title }}<figcaption class="figure-caption">{{.}}</figcaption>{{end -}}
 
 </figure>
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c0b1eef..c5f73ba 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
-<div class="posts-container mx-auto my-5">
-  <div class="post single">
+<div class="container mx-auto my-5">
+  <div class="post">
       {{ partial "single/header.html" . }}
       <div class="e-content">{{ .Content }}</div>
       {{ partial "single/footer.html" . }}
diff --git a/layouts/go/single.html b/layouts/go/single.html
index 6acf2b6..120c01d 100644
--- a/layouts/go/single.html
+++ b/layouts/go/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
-<div class="posts-container mx-auto my-5">
-  <div class="post single">
+<div class="container mx-auto my-5">
+  <div class="post">
       {{ partial "single/header.html" . }}
       <div>
         Установка:
diff --git a/layouts/partials/single/header.html b/layouts/partials/single/header.html
index 5566c56..c1c60a2 100644
--- a/layouts/partials/single/header.html
+++ b/layouts/partials/single/header.html
@@ -8,5 +8,5 @@
   </div>
 {{ end }}
 {{ if .Params.Image }}
-  <img class="d-block img-fluid mb-2 rounded border shadow" max-width="800" loading="lazy" src="{{ .RelPermalink }}{{.Params.Image}}" />
+  <img class="d-block img-fluid mb-2 rounded border shadow" loading="lazy" src="{{ .RelPermalink }}{{.Params.Image}}" />
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/walk.html b/layouts/partials/walk.html
index e115d6f..addf6f6 100644
--- a/layouts/partials/walk.html
+++ b/layouts/partials/walk.html
@@ -1,10 +1,9 @@
 {{- $page := .page }}
 {{- range .menuEntries }}
   {{- $attrs := dict "href" .URL }}
+  {{- $attrs = merge $attrs (dict "class" "nav-link") }}
   {{- if $page.IsMenuCurrent .Menu . }}
-    {{- $attrs = merge $attrs (dict "class" "active" "aria-current" "page") }}
-  {{- else if $page.HasMenuCurrent .Menu .}}
-    {{- $attrs = merge $attrs (dict "class" "ancestor" "aria-current" "true") }}
+    {{- $attrs = merge $attrs (dict "class" "active nav-link" "aria-current" "page") }}
   {{- end }}
   {{- $name := .Name }}
   {{- with .Identifier }}
@@ -15,10 +14,15 @@
   <li class="nav-item {{if .Children}}dropdown{{end}}">
     <a 
       {{if .Children}}
-        class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false"
-      {{ else }}
-        class="nav-link" href="{{.URL}}"
+        role="button"
+        data-bs-toggle="dropdown"
+        aria-expanded="false"
       {{ end }}
+      {{- range $k, $v := $attrs }}
+        {{- with $v }}
+          {{- printf " %s=%q" $k $v | safeHTMLAttr }}
+        {{- end }}
+      {{- end -}}
     >{{ $name }}</a>
     {{- with .Children }}
       <ul class="dropdown-menu">