From 14519d1dc4cdc7e62aacdb20d15f81f727aa2d7a Mon Sep 17 00:00:00 2001 From: Gabriel Date: Thu, 23 Mar 2023 10:46:27 -0400 Subject: [PATCH] some darknet improvements --- layouts/_default/list.html | 5 +- layouts/_default/single.html | 9 +- layouts/partials/header.html | 14 --- layouts/partials/item.html | 12 --- layouts/partials/metadata.html | 45 ++++----- layouts/shortcodes/relevant-items.html | 2 +- static/css/theme.css | 128 ++++++++++++------------- 7 files changed, 93 insertions(+), 122 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 17217b7..5648739 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -14,14 +14,17 @@ {{if .Content}} {{.Content}} {{end}} + {{ template "_internal/pagination.html" .}}
{{ if .Pages }} - {{range .Pages}} + {{range (.Paginate .Pages).Pages}} {{partial "item" .}} {{end}} {{end}}
+ {{ template "_internal/pagination.html" .}} + {{partial "footer" .}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5fba8ae..f14217f 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -8,13 +8,16 @@ {{partial "banner-item" .}} {{partial "spritesheet" .}}
+
{{.Content}} {{ if .Params.author}} + {{end}}
-
- {{partial "metadata" .}} -
+ {{$author := index .Site.Data.details.staff (.Params.author | default "default")}} + {{partial "metadata" .}} + {{if $author}} +

Thoughts or questions? Reply to this post

{{end}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 5376d9a..17106eb 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -12,18 +12,4 @@

{{.Title}}

 {{end}} - - {{ if .Site.Data.details.social_links}} - - {{end}} - diff --git a/layouts/partials/item.html b/layouts/partials/item.html index 5b6f8e9..eea7b70 100644 --- a/layouts/partials/item.html +++ b/layouts/partials/item.html @@ -5,17 +5,5 @@

{{.Title}}

{{.Params.description}} - {{if .GetTerms "tags"}} -
- {{ range (.GetTerms "tags")}} - - - - - {{.LinkTitle}} - - {{end}} -
- {{end}} \ No newline at end of file diff --git a/layouts/partials/metadata.html b/layouts/partials/metadata.html index b5c80c4..e68c9d0 100644 --- a/layouts/partials/metadata.html +++ b/layouts/partials/metadata.html @@ -1,33 +1,26 @@ -
-
+
{{$author := index .Site.Data.details.staff (.Params.author | default "default")}} -
- -

{{$author.name}}

- -
-
-

Published: {{.Date | time.Format "Jan 02 2006"}} + +

+

{{$author.name}}

+

Published: {{.Date | time.Format "Jan 02 2006"}} {{if .Params.updated}} -
Published: {{.Params.updated | time.Format "Jan 02 2006"}} +
Updated: {{.Params.updated | time.Format "Jan 02 2006"}} {{end}}

-
-
-
- {{ range (.GetTerms "tags")}} - - - - - {{.LinkTitle}} - {{end}} -
-
+
+

Tags:

+ {{ range (.GetTerms "tags")}} + + + + + + {{.LinkTitle}} + {{end}} +
+
-
- Reply to this post -
- \ No newline at end of file + \ No newline at end of file diff --git a/layouts/shortcodes/relevant-items.html b/layouts/shortcodes/relevant-items.html index 3150d37..ad7e4c1 100644 --- a/layouts/shortcodes/relevant-items.html +++ b/layouts/shortcodes/relevant-items.html @@ -1,7 +1,7 @@
{{ $tag := .Get 0 }} - {{range .Site.RegularPages.RelatedTo (keyVals "tags" $tag) }} + {{range .Site.RegularPages.RelatedTo (keyVals "tags" $tag) | first 5 }} {{partial "item" .}} {{end}}
\ No newline at end of file diff --git a/static/css/theme.css b/static/css/theme.css index 2edf9e8..f195403 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -68,11 +68,8 @@ hr { main, aside { display: flex; - flex-direction: row; - align-items: flex-start; - justify-content: space-evenly; - padding: 5px; - padding-top: 0; + flex-direction: column; + align-items: center; } article{ max-width:90vw; @@ -167,19 +164,7 @@ article > *{ flex-wrap: wrap; justify-content: space-evenly; } -.tags>a { - margin: 5px; - padding:2px; - border-radius: 3px; - font-size:14px; - font-weight: bolder; - display:flex; - flex-direction: row; - align-items: center; background-color: var(--theme-accent); - color: var(--theme-color-primary); - border-radius: 1.25rem; - padding:5px; -} + img, @@ -196,31 +181,24 @@ audio { flex-direction: row; align-items: center; justify-content: center; + width:100%; + flex-wrap: wrap; } -.metadata>div { +.metadata>* { margin: 1rem; display: flex; flex-direction: column; + flex-wrap: wrap; align-items: center; -} - -.metadata p { - max-width: 20rem; -} - -.metadata-author { - padding: 0.5rem; - display: flex; - flex-direction: column; align-items: center; - flex-wrap: nowrap; + min-width: 30%; + max-width:50%; +} +.metadata #tags{ + flex-direction: row; } -.metadata-author>img { - max-width: 5rem; - border-radius: 3rem; -} @@ -529,10 +507,10 @@ video { margin: 5px; padding:10px; border-radius: 50px; - font-size:16px; + font-size:12px; font-weight: bold; - background-color: var(--theme-accent); - color: var(--theme-color-primary); + background-color: var(--theme-color-primary); + color: var(--theme-accent); font-weight: bolder; display:flex; flex-direction: row; @@ -653,27 +631,10 @@ video { .listing-text{ font-size:14px; } - .metadata{ - max-width: 100%; - flex-wrap: wrap; - } - .metadata #tags a { - font-size:10px; - padding:0; - } - .metadata .icon{ - width:2rem; - height:2rem; - } nav{ font-size:10px; line-height: 14px; } - .social-link strong{ - display:none; - } - #social-links img{ - } #banner-text { font-size:12px; } @@ -691,17 +652,6 @@ svg{ height:1rem; width:1rem; } -.metadata #info{ - min-width:50%; -} -#info>div{ - display:flex; - flex-direction: row; -} -#info>div>*{ - margin:10px; -} - .bare-link{ text-decoration: none; } @@ -756,3 +706,51 @@ article a[href^="https"]:where(:not([href*="{{.Site.BaseURL}}"]))::after {conten .media-container a{ flex-direction: row; } + + +.pagination{ + list-style: none; + display:flex; + flex-direction: row; + flex-wrap: wrap; + width:100%; + max-width:90vw; + justify-content:center; + align-items: center; +} +.pagination>*{ + + margin:5px; +} +.pagination a { + font-family: Arial, Helvetica, sans-serif; + border:1px solid var(--theme-accent); + padding:10px; + font-size:22px; + font-weight: bolder; + border-radius: 10px; + text-decoration: none; + margin:0; +} +.pagination .disabled { + display:none; +} +.pagination .active a{ + color:var(--theme-color-primary); + background-color: var(--theme-accent); +} +#tags a { + margin: 5px; + padding:2px; + border-radius: 3px; + font-size:16px; + font-weight: bolder; + display:flex; + flex-direction: row; + border:2px solid var(--theme-accent); + align-items: center; + background-color: var(--theme-accent); + color: var(--theme-color-primary); + border-radius:25px; + padding:5px; +} \ No newline at end of file