Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matsuyoshi30/harbor.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatsuyoshi <sfbgwm30@gmail.com>2020-02-15 05:08:28 +0300
committermatsuyoshi <sfbgwm30@gmail.com>2020-02-15 05:08:28 +0300
commit78456b7e5ff71a5b6615baa6b22d0b94dbcb04a4 (patch)
tree8f07a8f7c33b1721b8ce663da84cc07ba30db340
parentf5ac8f853dc95f16adc6dca52e2087628a27bf18 (diff)
fix
-rw-r--r--archetypes/default.md4
-rw-r--r--layouts/_default/list.html18
-rw-r--r--layouts/_default/single.html2
-rw-r--r--layouts/_default/terms.html16
-rw-r--r--layouts/partials/footer.html2
-rw-r--r--layouts/partials/header.html6
-rw-r--r--layouts/partials/postmeta.html3
-rw-r--r--layouts/partials/preview.html15
-rw-r--r--static/css/main.css15
9 files changed, 40 insertions, 41 deletions
diff --git a/archetypes/default.md b/archetypes/default.md
index ac36e06..bb28786 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -1,2 +1,6 @@
+++
+title = "{{ replace .TranslationBaseName "-" " " | title }}"
+date = {{ .Date }}
+tags = [""]
+draft = false
+++
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index aef14d5..d90b0a5 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,13 +1,23 @@
{{ define "main" }}
<div class="container" role="main">
+ {{ with .Content }}
+ <div class="well">
+ {{.}}
+ </div>
+ {{ end }}
<div class="posts-list">
- {{ $pag := .Paginate (where site.RegularPages "Type" "in" site.Params.mainSections) }}
- {{ range $pag.Pages }}
+ {{ if .IsHome }}
+ {{ $pag := .Paginate (where site.RegularPages "Type" "in" site.Params.mainSections) }}
+ {{ else }}
+ {{ $pag := .Paginator.Pages }}
+ {{ end }}
+
+ {{ range .Paginator.Pages }}
{{ partial "preview.html" . }}
{{ end }}
- </div>
+ </div>
{{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }}
- <ul class="pager main-pager">
+ <ul class="pager">
{{ if .Paginator.HasPrev }}
<li class="previous">
<a href="{{ .Permalink }}page/{{ .Paginator.Prev.PageNumber }}/">&larr; Newer</a>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 6ea7953..f842495 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,7 +6,7 @@
{{ if .Params.tags }}
<div class="blog-tags">
{{ range .Params.tags }}
- <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
+ <a href="{{ $.Site.BaseURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
{{ end }}
</div>
{{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index ba4f3ec..bc60002 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -2,18 +2,14 @@
<div class="container" role="main">
<article class="post-preview">
- <div class="panel-group">
- {{ range $key, $value := .Data.Terms.ByCount }}
- <div class="panel panel-default" id="header{{ $value.Name }}">
- <h4 class="panel-title" >
- <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ $value.Name | urlize }}/" class="list-group-item view-all">
- {{ $value.Name }}
- </a>
- <span class="badge">{{ $value.Count }}</span>
+ {{ range $index, $term := .Data.Terms.Alphabetical }}
+ <div class="tags">
+ <h4 class="tag-name" >
+ <a href="{{ .Page.Permalink }}/">{{ $term.Name }}</a>
+ <span class="badge">{{ $term.Count }}</span>
</h4>
</div>
- {{ end }}
- </div>
+ {{ end }}
</article>
</div>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 42e28a0..a838762 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -11,7 +11,7 @@
{{ end }}
<p class="credits theme-by">
- Powered By <a href="https://gohugo.io">Hugo v{{ .Site.Hugo.Version }}</a>&nbsp;Theme <a href="https://github.com/matsuyoshi30/harbor">Harbor</a>
+ Powered By <a href="https://gohugo.io">Hugo</a>&nbsp;Theme <a href="https://github.com/matsuyoshi30/harbor">Harbor</a>
</p>
</p>
</div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 2d4f249..0093aa1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -21,11 +21,7 @@
<h1>{{ with $title }}{{.}}{{ else }}<br/>{{ end }}</h1>
{{ end }}
{{ if eq .Type "post" }}
- <span class="meta-post">
- <i class="fas fa-calendar"></i>&nbsp;{{ .Lastmod.Format ( .Site.Params.dateformat | default "Jan 2, 2006") }}
-
- &nbsp;|&nbsp;<i class="fas fa-clock"></i>&nbsp;{{ .ReadingTime }}&nbsp;minutes
- </span>
+ {{ partial "postmeta.html" . }}
{{ end }}
</div>
</div>
diff --git a/layouts/partials/postmeta.html b/layouts/partials/postmeta.html
new file mode 100644
index 0000000..d90273b
--- /dev/null
+++ b/layouts/partials/postmeta.html
@@ -0,0 +1,3 @@
+<span class="meta-post">
+ <i class="fa fa-calendar-alt"></i>&nbsp;{{ .Lastmod.Format ( .Site.Params.dateformat | default "Jan 2, 2006") }}
+</span>
diff --git a/layouts/partials/preview.html b/layouts/partials/preview.html
index c3afb75..d9dc756 100644
--- a/layouts/partials/preview.html
+++ b/layouts/partials/preview.html
@@ -7,21 +7,10 @@
{{ if .Truncated }}
<p>{{ .Summary }}</p>
<a href="{{ .Permalink }}" class="post-read-more">Read More</a>
- {{ else }}
- {{ .Content }}
{{ end }}
</div>
- {{ if .Params.tags }}
- <div class="blog-tags">
- {{ range .Params.tags }}
- <a href="{{ $.Site.LanguagePrefix | absURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
- {{ end }}
- </div>
- {{ else }}
- <div class="blog-tags">
- &nbsp;no tag
+ <div class="postmeta">
+ {{ partial "postmeta.html" . }}
</div>
- {{ end }}
-
</article>
diff --git a/static/css/main.css b/static/css/main.css
index 9905608..495b309 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -109,6 +109,7 @@ p {
}
.post-preview {
+ padding-bottom: 10px;
border-bottom: 1px solid #eeeeee;
}
@@ -121,15 +122,15 @@ p {
border-bottom: 0;
}
+.postmeta {
+ margin: 10px 0;
+}
+
.blog-tags {
font-family: 'Roboto', Helvetica, sans-serif;
color: #999;
font-size: 15px;
- margin-bottom: 30px;
-}
-
-.blog-tags:before {
- content: "Tags: ";
+ margin: 30px 0;
}
.blog-tags a {
@@ -142,7 +143,7 @@ p {
content: "#";
}
-h4.panel-title > span.badge {
+h4.tag-name > span.badge {
float: right;
}
@@ -359,7 +360,7 @@ footer a {
}
.blog-tags {
- margin-top: 10px;
+ margin: 20px 0;
}
.pager li a {