diff options
-rw-r--r-- | themes/default/layouts/_default/single.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/_default/summary.html | 36 | ||||
-rw-r--r-- | themes/default/layouts/_default/term.html | 2 | ||||
-rw-r--r-- | themes/default/layouts/partials/card.html | 35 |
4 files changed, 37 insertions, 38 deletions
diff --git a/themes/default/layouts/_default/single.html b/themes/default/layouts/_default/single.html index d4142f7..a32ae01 100644 --- a/themes/default/layouts/_default/single.html +++ b/themes/default/layouts/_default/single.html @@ -19,7 +19,7 @@ }} <micro-thread> - {{ partial "card.html" . }} + {{ .Render "summary" }} </micro-thread> {{ end }} diff --git a/themes/default/layouts/_default/summary.html b/themes/default/layouts/_default/summary.html index 3b6a0b3..ef4fe11 100644 --- a/themes/default/layouts/_default/summary.html +++ b/themes/default/layouts/_default/summary.html @@ -1 +1,35 @@ -{{ partial "card.html" . }} +<micro-card {{ if .Weight }}pinned{{ end }} id="{{ partial "card-id.html" . }}"> + {{ if .ExpiryDate }}<micro-expires>{{ end }} + <micro-summary title="{{- partial "title.html" . -}}"> + <micro-thumbnail> + {{ partial "profile-picture.html" . }} + </micro-thumbnail> + <micro-content> + <micro-metadata> + {{ partial "meta.html" . }} + </micro-metadata> + {{ if .Params.nsfw }} + <micro-nsfw> + <details> + <summary> + {{ safeHTML (readFile "static/icons/feather/alert-circle.svg") }} + <span>Danger: Unsafe Content. <b><u>Click here</u></b> to show/hide</span> + </summary> + </details> + <micro-nsfw-content> + {{ end }} + {{- + .Content | + replaceRE "<p>\n<figure>" "<figure>" | + replaceRE "</figure></p>" "</figure>" | + safeHTML + -}} + {{ if .Params.nsfw }} + </micro-nsfw-content> + </micro-nsfw> + {{ end }} + <micro-tags>{{ partial "tags.html" . }}</micro-tags> + </micro-content> + </micro-summary> + {{ if .ExpiryDate }}</micro-expires>{{ end }} +</micro-card> diff --git a/themes/default/layouts/_default/term.html b/themes/default/layouts/_default/term.html index 30776ff..8f31575 100644 --- a/themes/default/layouts/_default/term.html +++ b/themes/default/layouts/_default/term.html @@ -21,7 +21,7 @@ }} {{ range .Paginator.Pages }} - {{ partial "card.html" . }} + {{ .Render "summary" }} {{ end }} {{ partial "pagination.html" . }} diff --git a/themes/default/layouts/partials/card.html b/themes/default/layouts/partials/card.html deleted file mode 100644 index ef4fe11..0000000 --- a/themes/default/layouts/partials/card.html +++ /dev/null @@ -1,35 +0,0 @@ -<micro-card {{ if .Weight }}pinned{{ end }} id="{{ partial "card-id.html" . }}"> - {{ if .ExpiryDate }}<micro-expires>{{ end }} - <micro-summary title="{{- partial "title.html" . -}}"> - <micro-thumbnail> - {{ partial "profile-picture.html" . }} - </micro-thumbnail> - <micro-content> - <micro-metadata> - {{ partial "meta.html" . }} - </micro-metadata> - {{ if .Params.nsfw }} - <micro-nsfw> - <details> - <summary> - {{ safeHTML (readFile "static/icons/feather/alert-circle.svg") }} - <span>Danger: Unsafe Content. <b><u>Click here</u></b> to show/hide</span> - </summary> - </details> - <micro-nsfw-content> - {{ end }} - {{- - .Content | - replaceRE "<p>\n<figure>" "<figure>" | - replaceRE "</figure></p>" "</figure>" | - safeHTML - -}} - {{ if .Params.nsfw }} - </micro-nsfw-content> - </micro-nsfw> - {{ end }} - <micro-tags>{{ partial "tags.html" . }}</micro-tags> - </micro-content> - </micro-summary> - {{ if .ExpiryDate }}</micro-expires>{{ end }} -</micro-card> |