From f58575e23208ac42625d926194b5c04791402947 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 25 Jan 2023 10:03:12 +0100
Subject: [PATCH] New card template. Add settings to transpile sass with
 libsass or dartsass. Add setting to use internal pagination template. Wrap
 summary in p tags.

---
 README.md                        | 2 ++
 layouts/_default/card.html       | 8 ++++++++
 layouts/_default/summary.html    | 2 +-
 layouts/index.html               | 2 --
 layouts/partials/menu.html       | 2 +-
 layouts/partials/pagination.html | 9 ++++++---
 layouts/partials/styles.html     | 2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 layouts/_default/card.html

diff --git a/README.md b/README.md
index 6109e29..5fa92be 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,7 @@ params:
   icon: ""                  # Relative path to icon in json feed and JSON-LD, no leading slash.
   image: ""                 # Relative path to site image in JSON-LD, no leading slash.
   imageMaxWidth: ""         # Max width for images added via figure shortcode.
+  internalPagination: true  # Use Hugos internal pagination template, default false.
   jquery: true              # Add jQuery, default false.
   languageDir: ""           # Set ltr or rtl, defaults to ltr.
   logo: false               # Turn off the logo.
@@ -239,6 +240,7 @@ params:
   privacyPolicyUrl: ""      # If set will add link to cookie consent form.
   realfavicongenerator:     # If full set of favicons, site manifest etc. exists, default false.
   relatedposts: true        # Show related posts under a "See also" section, default false.
+  sassTranspiler: "dartsass"# The Sass transpiler to use, default "libsass".
   searchLimit: 20           # Max number of search hits, default 20.
   sidebar: true             # Show a sidebar to the right, default false.
   submitted: true           # Show author and date information for a post.
diff --git a/layouts/_default/card.html b/layouts/_default/card.html
new file mode 100644
index 0000000..d3ff31d
--- /dev/null
+++ b/layouts/_default/card.html
@@ -0,0 +1,8 @@
+<article class="card{{ with .Section }} card--{{ . | urlize }}{{ end }}">
+<header>
+<h2 class="title"><a href="{{ .RelPermalink }}">{{ .Title }}</a></h2>
+</header>
+<div class="content">
+<p>{{ .Summary }}</p>
+</div>
+</article>
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index c3a1e33..08fc1b6 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -4,6 +4,6 @@
 {{ if $.Param "submitted" | default false }}{{ partial "submitted.html" . -}}{{ end }}
 </header>
 <div class="content">
-{{ .Summary }}
+<p>{{ .Summary }}</p>
 </div>
 </article>
diff --git a/layouts/index.html b/layouts/index.html
index 8e20bf4..fa5bb2a 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,11 +2,9 @@
 
 {{ define "main" -}}
 <main class="main layout__main">
-<article class="single-view{{ with .Section }} single-view--{{ . | urlize }}{{ end }}">
 <div class="content">
 {{ .Content }}
 </div>
-</article>
 
 {{ $pages := where site.RegularPages "Type" "in" site.Params.mainSections }}
 {{ $paginator := .Paginate $pages -}}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index 9806574..6652c7d 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -1,4 +1,4 @@
-<nav class="main-menu layout__navigation" aria-label="{{ i18n "menu_title" }}">
+<nav class="main-menu{{ if not ($.Param "menuinheader") }} layout__navigation{{ end }}" aria-label="{{ i18n "menu_title" }}">
 <ul class="navbar">
 {{ if site.Menus.main -}}
 
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 34af0cd..1440def 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -1,11 +1,14 @@
+{{ if $.Param "internalpagination" -}}
+{{ template "_internal/pagination.html" . }}
+{{ else -}}
 {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) -}}
 <nav class="pager">
 {{ if .Paginator.HasPrev -}}
-<a href="{{ .Paginator.Prev.URL }}" rel="prev" class="pager-item pager-prev">{{ i18n "pager_prev" }}</a>
+<a href="{{ .Paginator.Prev.URL }}" rel="prev" class="pager__item pager__item--prev"><span aria-hidden="true">« </span>{{ i18n "pager_prev" }}</a>
 {{ end -}}
-
 {{ if .Paginator.HasNext -}}
-<a href="{{ .Paginator.Next.URL }}" rel="next" class="pager-item pager-next">{{ i18n "pager_next" }}</a>
+<a href="{{ .Paginator.Next.URL }}" rel="next" class="pager__item pager__item--next">{{ i18n "pager_next" }}<span aria-hidden="true"> »</span></a>
 {{ end -}}
 </nav>
 {{ end -}}
+{{ end -}}
diff --git a/layouts/partials/styles.html b/layouts/partials/styles.html
index 287acd0..421cd50 100644
--- a/layouts/partials/styles.html
+++ b/layouts/partials/styles.html
@@ -1,4 +1,4 @@
-{{ $main_options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" false "includePaths" (slice "assets/sass/lib/typey/stylesheets")) -}}
+{{ $main_options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed" "enableSourceMap" false "transpiler" (site.Params.sassTranspiler | default "libsass")) -}}
 {{ if eq hugo.Environment "development" -}}
   {{ $main_options = merge $main_options (dict "outputStyle" "nested" "enableSourceMap" true) -}}
 {{ end -}}