diff --git a/assets/css/main.css b/assets/css/main.css index 606acbf..48d15a9 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -154,6 +154,7 @@ blockquote { padding-left: 2rem; background: var(--secondary-color-dark); box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5); + border-radius: 0 var(--radius) var(--radius) 0; } details { diff --git a/layouts/partials/list/page-link.html b/layouts/partials/list/page-link.html index b81b28d..e42bde2 100644 --- a/layouts/partials/list/page-link.html +++ b/layouts/partials/list/page-link.html @@ -10,7 +10,7 @@ {{ .LinkTitle | emojify }} {{ if $showDate }} {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := dateFormat "Jan 01, 2006" .Date }} + {{ $dateHuman := dateFormat "Jan 02, 2006" .Date }} {{ end }} diff --git a/layouts/partials/single/meta.html b/layouts/partials/single/meta.html index c90c99c..34c7280 100644 --- a/layouts/partials/single/meta.html +++ b/layouts/partials/single/meta.html @@ -2,41 +2,29 @@ {{ $showModDate := .Params.showModDate | default (.Site.Params.article.showModDate | default false) }} {{ $showReadingTime := .Params.showReadingTime | default (.Site.Params.article.showReadingTime | default true) }} -{{ $meta := slice }} -{{ $icons := slice }} +

{{/* Date Reading time and Draft label */}} {{ if $showDate }} -{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} -{{ $dateHuman := .Date | time.Format "Jan 01, 2006" }} -{{ $icons = $icons | append "calender" }} -{{ $meta = $meta | append (printf "Posted on " $dateMachine $dateHuman) }} - -{{ $dateModMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} -{{ $dateModHuman := .Lastmod | time.Format "Jan 01, 2006" }} -{{ if and $showModDate (ne $dateModHuman $dateHuman) }} -{{ $icons = $icons | append "pencil" }} -{{ $meta = $meta | append (printf "Last edited " $dateModMachine $dateModHuman) }} -{{ end }} + {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} + {{ $dateHuman := .Date | time.Format "Jan 2, 2006" }} + {{ partial "icon.html" "calender" }} + Posted on + {{ $dateModMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} + {{ $dateModHuman := .Lastmod | time.Format "Jan 2, 2006" }} + {{ if and $showModDate (ne $dateModHuman $dateHuman) }} + {{ partial "icon.html" "pencil" }} + Last edited + {{ end }} {{ end }} {{ if $showReadingTime }} -{{ $icons = $icons | append "time" }} -{{ if gt .ReadingTime 1 }} -{{ $meta = $meta | append (printf "%s mins" (.ReadingTime | markdownify)) }} -{{ else }} -{{ $meta = $meta | append (printf "%s min" (.ReadingTime | markdownify)) }} -{{ end }} + {{ partial "icon.html" "time" }} + {{ if gt .ReadingTime 1 }} + {{ printf "%s mins" (.ReadingTime | markdownify) }} + {{ else }} + {{ printf "%s min" (.ReadingTime | markdownify) }} + {{ end }} {{ end}} {{ if .Draft }} -{{ $icons = $icons | append "edit" }} -{{ $meta = $meta | append "DRAFT" }} + {{ partial "icon.html" "edit" }}DRAFT {{ end }} -{{/* $meta := delimit $meta " | " */}} -{{ if gt (len $meta) 0 }} -

- {{ range $idx, $ent := $meta }} - {{ if gt $idx 0 }} · {{ end }} - {{ $iname := index $icons $idx }} - {{ partial "icon.html" $iname }} {{ $ent | safeHTML }} - {{ end }}

-{{ end }}