aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/css/main.css48
-rw-r--r--assets/icons/calendar.svg11
-rw-r--r--assets/icons/location.svg13
-rw-r--r--assets/icons/tag.svg8
-rw-r--r--layouts/_default/baseof.html6
-rw-r--r--layouts/partials/footer.html8
-rw-r--r--layouts/partials/head.html9
-rw-r--r--layouts/partials/single/footer.html8
-rw-r--r--layouts/partials/single/header.html7
9 files changed, 66 insertions, 52 deletions
diff --git a/assets/css/main.css b/assets/css/main.css
index 90cf82b..c76e024 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -1,12 +1,16 @@
.posts-container {
- max-width:760px
+ max-width:760px;
}
.bd-gutter {
- --bs-gutter-x: 3rem
+ --bs-gutter-x: 3rem;
}
.page,
.post {
- margin-bottom:4em
+ margin-bottom:4rem;
+ padding: 0 1rem;
+}
+.post-footer {
+ margin: 1rem 0 4rem;
}
.page-title,
.post-title,
@@ -17,7 +21,7 @@
display:block;
margin-top:-.5rem;
margin-bottom:1rem;
- color:#767676
+ color:#767676;
}
.post a {
word-break:break-word
@@ -56,42 +60,6 @@
width: 600px;
}
-#fastSearch {
- visibility: hidden;
- position: absolute;
- right: 0px;
- top: 0px;
- display: inline-block;
- width: 300px;
-}
-
-#fastSearch input {
- padding: 4px 10px;
- width: 100%;
- height: 31px;
- font-size: 1.6em;
- color: #aaa;
- font-weight: bold;
- background-color: #000;
- border-radius: 3px 3px 0px 0px;
- border: none;
- outline: none;
- text-align: left;
- display: inline-block;
-}
-
-#searchResults li {
- list-style: none;
- margin-left: 0em;
- background-color: #333;
- border-bottom: 1px dotted #000;
-}
- #searchResults li .title { font-size: 1.1em; margin-bottom: 10px; display: inline-block;}
-
-#searchResults { visibility: inherit; display: inline-block; width: 320px; }
-#searchResults a { text-decoration: none !important; padding: 10px; display: inline-block; }
- #searchResults a:hover, a:focus { outline: 0; background-color: #666; color: #fff; }
-
@font-face {
font-family: 'Lobster';
font-style: normal;
diff --git a/assets/icons/calendar.svg b/assets/icons/calendar.svg
new file mode 100644
index 0000000..17b731f
--- /dev/null
+++ b/assets/icons/calendar.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+ stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+ class="icon icon-tabler icons-tabler-outline icon-tabler-calendar">
+ <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+ <path d="M4 7a2 2 0 0 1 2 -2h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2h-12a2 2 0 0 1 -2 -2v-12z" />
+ <path d="M16 3v4" />
+ <path d="M8 3v4" />
+ <path d="M4 11h16" />
+ <path d="M11 15h1" />
+ <path d="M12 15v3" />
+</svg> \ No newline at end of file
diff --git a/assets/icons/location.svg b/assets/icons/location.svg
new file mode 100644
index 0000000..457267c
--- /dev/null
+++ b/assets/icons/location.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+ stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+ class="icon icon-tabler icons-tabler-outline icon-tabler-world-pin">
+ <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+ <path d="M20.972 11.291a9 9 0 1 0 -8.322 9.686" />
+ <path d="M3.6 9h16.8" />
+ <path d="M3.6 15h8.9" />
+ <path d="M11.5 3a17 17 0 0 0 0 18" />
+ <path d="M12.5 3a16.986 16.986 0 0 1 2.578 9.018" />
+ <path
+ d="M21.121 20.121a3 3 0 1 0 -4.242 0c.418 .419 1.125 1.045 2.121 1.879c1.051 -.89 1.759 -1.516 2.121 -1.879z" />
+ <path d="M19 18v.01" />
+</svg> \ No newline at end of file
diff --git a/assets/icons/tag.svg b/assets/icons/tag.svg
new file mode 100644
index 0000000..7611a43
--- /dev/null
+++ b/assets/icons/tag.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+ stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
+ class="icon icon-tabler icons-tabler-outline icon-tabler-tag">
+ <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+ <path d="M7.5 7.5m-1 0a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" />
+ <path
+ d="M3 6v5.172a2 2 0 0 0 .586 1.414l7.71 7.71a2.41 2.41 0 0 0 3.408 0l5.592 -5.592a2.41 2.41 0 0 0 0 -3.408l-7.71 -7.71a2 2 0 0 0 -1.414 -.586h-5.172a3 3 0 0 0 -3 3z" />
+</svg> \ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a984f1c..313ce06 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,9 @@
<!DOCTYPE html>
-<html lang="{{ site.Language.LanguageCode }}" dir="{{ or site.Language.LanguageDirection `ltr` }}">
+<html
+ lang="{{ site.Language.LanguageCode }}"
+ dir="{{ or site.Language.LanguageDirection `ltr` }}"
+ data-bs-theme="auto"
+>
<head>
{{ partial "head.html" . }}
</head>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1917788..3838be6 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -5,6 +5,14 @@
<cite>2007—{{ now.Year }} Александр NeonXP Кирюхин. г.Казань</cite>
</div>
<div class="col">
+ {{ with .GitInfo }}
+ <ul class="list-unstyled float-end">
+ <li>Коммит: {{ .AbbreviatedHash }}</li>
+ <li>Дата: {{ .AuthorDate.Format "2006-01-02" }}</li>
+ </ul>
+ {{ end }}
+ </div>
+ <div class="col">
<ul class="list-unstyled float-end">
<li><a href="https://git.neonxp.ru/blog.git">Исходный код</a></li>
<li><a href="mailto:i@neonxp.ru" rel="me">Электропочта</a></li>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c0ee0a8..f2c7ece 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,12 +1,13 @@
<meta charset="utf-8">
-<meta name="viewport" content="width=device-width">
+<meta name="viewport" content="width=device-width, initial-scale=1">
{{if .Params.gomod}}
<meta name="go-import" content="neonxp.ru/go/{{ .Params.Name }} git {{ .Params.Repository }}">
<meta name="go-source" content="neonxp.ru/go/{{ .Params.Name }} {{ .Params.Repository }} {{ .Params.Repository }}/tree/{/dir} {{ .Params.Repository }}/tree/master{/dir}/{file}#n{line}">
{{end}}
+{{ template "_internal/opengraph.html" . }}
+{{ template "_internal/schema.html" . }}
+{{ template "_internal/twitter_cards.html" . }}
+
<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://neonxp.ru/micropub"> -->
<title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title>
{{ partialCached "head/css.html" . }}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index 5c53001..66e4dc5 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -1,11 +1,15 @@
-<footer>
+<footer class="post-footer">
<div class="row between-xs">
<span>
+ {{ partial "icon.html" "tag" }}
{{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
</span>
{{ if .Params.Location }}
- <span class="p-location">@ {{.Params.Location}}</span>
+ <span class="p-location">
+ {{ partial "icon.html" "location" }}
+ {{.Params.Location}}
+ </span>
{{ end }}
</div>
</footer>
diff --git a/layouts/partials/single/header.html b/layouts/partials/single/header.html
index 7b40390..f5ece1f 100644
--- a/layouts/partials/single/header.html
+++ b/layouts/partials/single/header.html
@@ -1,11 +1,8 @@
<h1 class="post-title fw-semibold"><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h1>
{{ if .Date }}
<div class="d-flex align-items-center mb-4 text-muted">
- <span class="d-flex align-items-center ms-3" title="{{- .Date | time.Format (or .Site.Params.dateFormat.published "02 Jan 2006") -}}">
- <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" class="me-2" viewBox="0 0 16 16">
- <path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5z"></path>
- <path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5M1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4z"></path>
- </svg>
+ <span class="d-flex align-items-center" title="{{- .Date | time.Format (or .Site.Params.dateFormat.published "02 Jan 2006") -}}">
+ {{ partial "icon.html" "calendar" }}
{{- .Date | time.Format (or .Site.Params.dateFormat.published "02 Jan 2006") -}}
</span>
</div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 00:00:51 +0300