diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/single.html | 1 | ||||
| -rw-r--r-- | layouts/index.html | 12 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 74 | ||||
| -rw-r--r-- | layouts/partials/index/siteSections.html | 19 | ||||
| -rw-r--r-- | layouts/partials/prevNext.html | 16 | ||||
| -rw-r--r-- | layouts/partials/regularHeader.html | 6 | ||||
| -rw-r--r-- | layouts/partials/share.html | 79 | ||||
| -rw-r--r-- | layouts/partials/taxa.html | 4 |
8 files changed, 113 insertions, 98 deletions
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9983b08..13c11a3 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,3 +1,4 @@ {{ define "main" }} +{{ partial "share" . }} {{ .Content }} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index ba73a48..be209af 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,11 +1,3 @@ -{{ define "main" }} {{ partial "index/pinnedPost" . }} -<div class="grid-container"> - <div class="recent-posts card shadow round-corner"> - {{ partial "index/recentPost" . }} - {{ partial "index/siteSections" . }} - </div> - <div class="site-sections card shadow round-corner"> - {{ partial "taxa" (dict "taxo" .Site.Taxonomies "mysite" .) }} - </div> -</div> +{{ define "main" }} +{{ partial "index/pinnedPost" . }} {{ end }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 7406a3d..6d9feb9 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,30 +1,56 @@ -<footer class="shadow round-corner"> +<footer> + <!-- Pagination for list pages --> {{ if eq .Kind "section" }} <div>{{ template "_internal/pagination.html" . }}</div> - {{ end }} {{ if eq .Kind "page" }} + {{ end }} + <!-- Previous/Next articles --> + {{ if eq .Kind "page" }} <div class="prev-next">{{ partial "prevNext" .}}</div> {{ end }} - <p> - {{ if .Site.Params.theme.copyrightInFooter }}<span>©</span>{{end}} - <span>{{ dateFormat "2006" now }}</span> - <span>{{ .Site.Params.author }}.</span> - <span>{{ .Site.Params.theme.footerText | markdownify }}.</span> - </p> - <p> - <a href="https://github.com/urjaacharya/redgood"> - {{- print "redgood" -}} - </a> - by - <a - href="https://www.urjaacharya.com/" - aria-label="link to urja acharya site" - > - {{- print "urja acharya" -}} - </a> - </p> - <div style="text-align: right; margin-bottom: 0.25em;"> - <a class="primary-icon to-top" href="#" aria-label="navigate to top" - ><i class="bi bi-box-arrow-in-up"></i - ></a> + <div class="footer shadow round-corner"> + <!-- Recent Posts --> + <div class="grid-container"> + <div class="footer-recent-posts"> + <h6>Recent Posts</h6> + <ol> + {{ range ((where .Site.Pages "Kind" "page").ByDate.Reverse) | first 7 }} + <li><a href="{{ .Permalink }}">{{ .Title }}</a></li> + {{ end }} + </ol> + <a href="{{ `archive` | relURL }}">...ALL POSTS</a> + <hr class="mobile white-hr" /> + </div> + <div> + {{ partial "index/siteSections.html" . }} + {{ partial "taxa" (dict "taxo" .Site.Taxonomies "mysite" .) }} + <hr class="mobile white-hr" /> + </div> + </div> + <!-- Footer info from config --> + <div class="footer-info-text"> + <p> + {{ if .Site.Params.theme.copyrightInFooter }}<span>©</span>{{end}} + <span>{{ dateFormat "2006" now }}</span> + <span>{{ .Site.Params.author }}.</span> + <span>{{ .Site.Params.theme.footerText | markdownify }}.</span> + </p> + <p> + <a href="https://github.com/urjaacharya/redgood"> + {{- print "redgood" -}} + </a> + by + <a + href="https://www.urjaacharya.com/" + aria-label="link to urja acharya site" + > + {{- print "urja acharya" -}} + </a> + </p> + </div> + <div style="text-align: right; margin-bottom: 0.25em; font-size: 1.2em"> + <a class="primary-icon to-top" href="#" aria-label="navigate to top"> + <i class="bi bi-arrow-up-circle-fill"></i> + </a> + </div> </div> </footer> diff --git a/layouts/partials/index/siteSections.html b/layouts/partials/index/siteSections.html index 01f0697..0cfbc0d 100644 --- a/layouts/partials/index/siteSections.html +++ b/layouts/partials/index/siteSections.html @@ -1,9 +1,10 @@ -<h4 style="margin: 1em 0 1em 0;">Sections</h4> -{{ range .Site.Sections }} -{{ if not .Params.hideFromHome }} -<p> - <a href="{{ .Permalink }}" aria-label="site sections">{{ .Title }}</a> - - {{ len .Pages}} Articles -</p> -{{ end }} -{{ end }}
\ No newline at end of file +<h6>Sections</h6> +<div class="section-container"> + {{ range .Site.Sections }} + {{ if not .Params.hideFromHome }} + <a class="section" href="{{ .Permalink }}" aria-label="site sections" + >{{ .Title }}</a + > + {{ end }} + {{ end }} +</div> diff --git a/layouts/partials/prevNext.html b/layouts/partials/prevNext.html index 50c47a5..41fa1ff 100644 --- a/layouts/partials/prevNext.html +++ b/layouts/partials/prevNext.html @@ -1,22 +1,24 @@ +{{if or .PrevInSection .NextInSection }} {{- if .PrevInSection }} <a - class="active primary-icon" + class="active icon" href="{{ .PrevInSection.Permalink | relURL }}" aria-label="Previous Article" - ><i class="bi bi-arrow-left-circle"></i + ><i class="bi bi-arrow-left-circle-fill"></i ></a> {{- else }} - <div class="disabled"><i class="bi bi-arrow-left-circle"></i></div> + <div class="disabled icon"><i class="bi bi-arrow-left-circle-fill"></i></div> {{- end }} {{- if .NextInSection }} <a - class="active primary-icon" + class="active icon" href="{{ .NextInSection.Permalink | relURL }}" aria-label="Next Article" - ><i class="bi bi-arrow-right-circle"></i + ><i class="bi bi-arrow-right-circle-fill"></i ></a> {{- else }} - <div class="disabled"><i class="bi bi-arrow-right-circle"></i></div> + <div class="disabled icon"><i class="bi bi-arrow-right-circle-fill"></i></div> {{- end }} - </div>
\ No newline at end of file + </div> + {{ end }}
\ No newline at end of file diff --git a/layouts/partials/regularHeader.html b/layouts/partials/regularHeader.html index 8f3f144..93dac99 100644 --- a/layouts/partials/regularHeader.html +++ b/layouts/partials/regularHeader.html @@ -8,12 +8,12 @@ " > <a class="primary-icon" href="{{ `/` | relURL }}" aria-label="home page"> - <i class="bi bi-house-door"></i> + <i class="bi bi-house-fill"></i> </a> - {{ partial "share" . }} + </div> <div class="page-title-and-info" style="text-align: center"> - <h1 class="page-title"> + <h1 class="page-title" {{ if not (eq .Kind `page`) }}style="margin-bottom: 1em;"{{ end }}> {{ if or (eq .Kind "taxonomy") (eq .Kind "term") }}#{{ end }}{{ .Title }} </h1> {{ if eq .Kind "page" }} diff --git a/layouts/partials/share.html b/layouts/partials/share.html index 3b84c35..bccc6e1 100644 --- a/layouts/partials/share.html +++ b/layouts/partials/share.html @@ -1,44 +1,37 @@ -<div - class="share-links" - style=" - display: flex; - margin-left: 1em; - align-items: center; - width: 140px; - justify-content: space-between; - " -> - {{ $url := printf "%s" .URL | absLangURL }} - <a - class="primary-icon" - href="mailto:?subject={{ print .Title ` by ` .Site.Params.author }}&body={{ $url }}" - target="_self" - rel="noopener" - aria-label="share by email" - ><i class="bi bi-envelope"></i - ></a> - <a - class="primary-icon" - href="https://facebook.com/sharer/sharer.php?u={{ $url }}" - target="_blank" - rel="noopener" - aria-label="share on facebook" - ><i class="bi bi-facebook"></i - ></a> - <a - class="primary-icon" - href="https://twitter.com/intent/tweet/?text={{ print .Title ` by ` .Site.Params.author }}&url={{ $url }}" - target="_blank" - rel="noopener" - aria-label="share on twitter" - ><i class="bi bi-twitter"></i - ></a> - <a - class="primary-icon" - href="https://www.linkedin.com/sharing/share-offsite/?url={{ $url }}" - target="_blank" - rel="noopener" - aria-label="share on twitter" - ><i class="bi bi-linkedin"></i - ></a> +<div style="display: flex; justify-content: flex-end"> + <div class="share-links"> + {{ $url := printf "%s" .URL | absLangURL }} + <a + class="icon active" + href="mailto:?subject={{ print .Title ` by ` .Site.Params.author }}&body={{ $url }}" + target="_self" + rel="noopener" + aria-label="share by email" + ><i class="bi bi-envelope-fill"></i + ></a> + <a + class="icon active" + href="https://facebook.com/sharer/sharer.php?u={{ $url }}" + target="_blank" + rel="noopener" + aria-label="share on facebook" + ><i class="bi bi-facebook"></i + ></a> + <a + class="icon active" + href="https://twitter.com/intent/tweet/?text={{ print .Title ` by ` .Site.Params.author }}&url={{ $url }}" + target="_blank" + rel="noopener" + aria-label="share on twitter" + ><i class="bi bi-twitter"></i + ></a> + <a + class="icon active" + href="https://www.linkedin.com/sharing/share-offsite/?url={{ $url }}" + target="_blank" + rel="noopener" + aria-label="share on twitter" + ><i class="bi bi-linkedin"></i + ></a> + </div> </div> diff --git a/layouts/partials/taxa.html b/layouts/partials/taxa.html index 3485c4b..ffd3a2b 100644 --- a/layouts/partials/taxa.html +++ b/layouts/partials/taxa.html @@ -6,9 +6,9 @@ {{ range sort ($scratch.Get "custom") ".Num" "desc" }} {{ $taxaTypeName := .Name }} -<h4 style="margin: 0;"> +<h6> {{ $taxaTypeName | humanize }} -</h4> +</h6> {{ $this_taxa := index $.taxo .Name }} <div class="taxa-container"> {{ range $this_taxa.ByCount }} |