Skip to content

Commit

Permalink
modifies #116 with minimal changes to keep in-par with Original theme…
Browse files Browse the repository at this point in the history 
…'s layout

Signed-off-by: 1bl4z3r <[email protected]>
  • Loading branch information
@1bl4z3r
1bl4z3r committed Feb 23, 2025
1 parent 8f9d7a1 commit 57bbdc8
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 57 deletions.
18 changes: 12 additions & 6 deletions assets/scss/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,23 +552,31 @@ p.img-404 {
@include dimmed;
}

.post-tags {
.post-tags,
.post-categories {
display: flex;
flex-wrap: wrap;
flex-shrink: 0;
font-size:x-small;
font-size: xx-small;
@include dimmed;

a {
margin-right: 0.5em;
}
}
.post-tags {
padding-right: 12px;
}

.post-description {
font-size:x-small;
flex-shrink: 0;
@include dimmed;
}
.post-taxonomy {
display: flex;
justify-content: flex-start;
align-items: baseline;
}
}

.pinned-posts-group {
Expand Down Expand Up @@ -792,9 +800,7 @@ a.footnote-ref {
margin-right: .8em;
}

.tag {
margin-right: .5em;
}
.tag,
.category {
margin-right: .5em;
}
Expand Down
3 changes: 2 additions & 1 deletion hugo.toml.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ expiryDate = ["expiryDate"]
# pinned = "Pinned Posts"
# pinnedSVGname = "pin"
# descriptionInPosts = true
# tagsInPost = false
# tagsInPosts = true
# categoriesInPosts = false
# initialPublish = "Initally Posted on: "
# human = ["single","posts"]
# noIndex = false
Expand Down
103 changes: 76 additions & 27 deletions layouts/_default/list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@

{{ define "title" }}
{{- if in .Page.RelPermalink "tags" -}}
{{- with .Site.Params.tagSymbol | default "#" -}}{{ . }}{{- end -}}{{ .Title | lower }}
{{- with .Site.Params.tagSymbol | default "#" -}}{{ . }}{{- end -}}{{ .Title | lower }}
{{- else if in .Page.RelPermalink "categories" -}}
{{- with .Site.Params.categorySymbol | default "⊲" -}}{{ . }}{{- end -}}{{ .Title | lower }}
{{- else -}}
{{ .Title }}
{{- end -}}
{{ end }}

{{ define "main" }}
<main class="site-main section-inner thin {{- if ne false .Site.Params.usesAnimation }} animated fadeIn faster{{- end -}}">
{{- if in .Page.RelPermalink "tags" -}}
{{- if in .Page.RelPermalink "tags" -}}
<h1 class="tag">{{ .Title }}</h1>
{{- else -}}
{{- else if in .Page.RelPermalink "categories" -}}
<h1 class="category">{{ .Title }}</h1>
{{- else -}}
<h1>{{ .Title }}</h1>
{{- end -}}
{{- if .Content }}
<div class="content">
{{ .Content }}
</div>
{{- end }}
{{- end -}}
{{- if .Content }}<div class="content">{{ .Content }}</div>{{ end -}}

{{- if and (ge (len (where .Site.Pages ".Params.pin" true)) 1) (.Site.Params.pinned) (not (or (in .Page.RelPermalink "tags") (in .Page.RelPermalink "categories"))) -}}
<h2>{{- .Site.Params.pinned -}}</h2>
Expand All @@ -36,35 +36,84 @@ <h2>{{- .Site.Params.pinned -}}</h2>
</ul>
</div>
{{- end -}}
{{- if not (or (in .Page.RelPermalink "tags") (in .Page.RelPermalink "categories")) -}}
{{- range .Data.Pages.GroupByDate "2006" }}
{{ $pages := len (.Pages) }}
{{ $pages_pin := len ( where .Pages ".Params.pin" "eq" true) }}
{{- if gt $pages $pages_pin -}}
<div class="posts-group">
<div class="post-year" id="{{ .Key }}">{{ .Key }}</div>
<ul class="posts-list">
{{- range where .Pages ".Params.pin" "ne" true }}
<li class="post-item">
<a href="{{.Permalink}}">
<span class="post-title">{{.Title}}</span>
<span class="post-day">{{ .Date.Format .Site.Params.dateformShort }}</span>
</a>
{{- if and .Page.Params.description .Site.Params.descriptionInPosts -}}
<span class="post-description">{{ .Page.Params.description }}</span>
{{- end -}}
{{- if or .Site.Params.tagsInPosts .Site.Params.categoriesInPosts -}}<div class="post-taxonomy">
{{- if and .Page.Params.tags .Site.Params.tagsInPosts -}}
<span class="post-tags">
{{- range .Page.Params.tags -}}
<a href="{{- printf "/tags/%s" . | urlize -}}" class="tag">{{- . -}}</a>
{{- end -}}
</span>
{{- end -}}
{{- if and .Page.Params.categories .Site.Params.categoriesInPosts -}}
<span class="post-categories">
{{- range .Page.Params.categories -}}
<a href="{{- printf "/categories/%s" . | urlize -}}" class="category">{{- . -}}</a>
{{- end -}}
</span>
{{- end -}}
</div>{{- end -}}
</li>
{{- end }}
</ul>
</div>
{{- end -}}
{{- end }}
{{- else -}}
{{- range .Data.Pages.GroupByDate "2006" }}
{{ $pages := len (.Pages) }}
{{ $pages_pin := len ( where .Pages ".Params.pin" "eq" true) }}
{{- if gt $pages $pages_pin -}}
<div class="posts-group">
<div class="post-year" id="{{ .Key }}">{{ .Key }}</div>
<ul class="posts-list">
{{- range where .Pages ".Params.pin" "ne" true }}
{{- range .Pages }}
<li class="post-item">
<a href="{{.Permalink}}">
<span class="post-title">{{.Title}}</span>
<span class="post-day">{{ .Date.Format .Site.Params.dateformShort }}</span>
</a>
{{- if and .Page.Params.description .Site.Params.descriptionInPosts -}}
<span class="post-description">{{ .Page.Params.description }}</span>
{{- end -}}
{{- if and .Page.Params.tags .Site.Params.tagsInPosts -}}
<span class="post-tags">
{{- range .Page.Params.tags -}}
<a href="{{- printf "/tags/%s" . | urlize -}}" class="tag">{{- . -}}</a>
<a href="{{.Page.RelPermalink}}">
{{- if in .Page.RelPermalink "tags" -}}<span class="post-title tag">{{.Page.LinkTitle }}</span>
{{- else if in .Page.RelPermalink "categories" -}}<span class="post-title category">{{.Page.LinkTitle}}</span>
{{- else -}}<span class="post-title">{{.Page.LinkTitle}}</span>
{{- end -}}
</span>
{{- end -}}
<span class="post-day">{{ .Date.Format .Site.Params.dateformShort }}</span>
</a>
{{- if and .Page.Params.description .Site.Params.descriptionInPosts -}}
<span class="post-description">{{ .Page.Params.description }}</span>
{{- end -}}
{{- if or .Site.Params.tagsInPosts .Site.Params.categoriesInPosts -}}<div class="post-taxonomy">
{{- if and .Page.Params.tags .Site.Params.tagsInPosts -}}
<span class="post-tags">
{{- range .Page.Params.tags -}}
<a href="{{- printf "/tags/%s" . | urlize -}}" class="tag">{{- . -}}</a>
{{- end -}}
</span>
{{- end -}}
{{- if and .Page.Params.categories .Site.Params.categoriesInPosts -}}
<span class="post-categories">
{{- range .Page.Params.categories -}}
<a href="{{- printf "/categories/%s" . | urlize -}}" class="category">{{- . -}}</a>
{{- end -}}
</span>
{{- end -}}
</div>{{- end -}}
</li>
{{- end }}
</ul>
</div>
{{- end -}}
{{- end }}
{{- end -}}
</main>
{{ end }}
{{ define "footer" }}<footer id="site-footer" class="section-inner thin {{- if ne false .Site.Params.usesAnimation }} animated fadeIn faster {{- end -}}">{{- if templates.Exists "partials/list-footer.html" -}}{{- partialCached "list-footer.html" . -}}{{- else -}}{{- partial "footer.html" . -}}{{- end -}}</footer>
Expand Down
61 changes: 38 additions & 23 deletions layouts/_default/terms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,44 @@
{{ define "main" }}
<main class="site-main section-inner thin {{- if ne false .Site.Params.usesAnimation }} animated fadeIn faster{{- end -}}">
<h1>{{ .Title }}</h1>
{{- if .Content }}
<div class="content">
{{ .Content }}
</div>
{{- end }}

{{- range .Data.Terms.ByCount }}
<div class="posts-group">
<ul class="posts-list">
<li class="post-item">
<a href="{{.Page.RelPermalink}}">
{{- if in .Page.RelPermalink "tags" -}}
<span class="post-title tag">{{.Page.LinkTitle }}</span>
{{- else if in .Page.RelPermalink "categories" -}}
<span class="post-title category">{{.Page.LinkTitle}}</span>
{{- else -}}
<span class="post-title">{{.Page.LinkTitle}}</span>
{{- end -}}
<span class="post-day">{{ .Count }}</span>
</a>
</li>
</ul>
</div>
{{- if .Content }}<div class="content">{{ .Content }}</div>{{ end -}}
{{- if (and (or (in .Page.RelPermalink "tags") (in .Page.RelPermalink "categories")) .Site.Params.legacyList) -}}
{{- range .Data.Pages.GroupByDate "2006" }}
<div class="posts-group">
<div class="post-year" id="{{ .Key }}">
{{ .Key }}
</div>
<ul class="posts-list">
{{- range .Pages }}
<li class="post-item">
<a href="{{.Page.RelPermalink}}">
{{- if in .Page.RelPermalink "tags" -}}<span class="post-title tag">{{.Page.LinkTitle }}</span>
{{- else if in .Page.RelPermalink "categories" -}}<span class="post-title category">{{.Page.LinkTitle}}</span>
{{- else -}}<span class="post-title">{{.Page.LinkTitle}}</span>
{{- end -}}
<span class="post-day">{{ .Date.Format .Site.Params.dateformShort }}</span>
</a>
</li>
{{- end }}
</ul>
</div>
{{- end }}
{{- else if (and (or (in .Page.RelPermalink "tags") (in .Page.RelPermalink "categories")) (not .Site.Params.legacyList)) -}}
{{- range .Data.Terms.ByCount }}
<div class="posts-group">
<ul class="posts-list">
<li class="post-item">
<a href="{{.Page.RelPermalink}}">
{{- if in .Page.RelPermalink "tags" -}}<span class="post-title tag">{{.Page.LinkTitle }}</span>
{{- else if in .Page.RelPermalink "categories" -}}<span class="post-title category">{{.Page.LinkTitle}}</span>
{{- else -}}<span class="post-title">{{.Page.LinkTitle}}</span>
{{- end -}}
<span class="post-day">{{ .Count }}</span>
</a>
</li>
</ul>
</div>
{{- end -}}
{{- end -}}
</main>
{{ end }}
Expand Down

0 comments on commit 57bbdc8

Please sign in to comment.