Merge branch 'main' into master

.gitignore

@@ -1,6 +1,57 @@
-exampleSite/public/*
+## custom
+
+/_drafts/
+
+## macos
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+## hugo
+
 *.patch
-exampleSite/resources/_gen/
+
-node_modules
+# Generated files by hugo
+/public/
+exampleSite/public/*
+/resources/_gen/
+/exampleSite/resources/_gen/
+/assets/jsconfig.json
+hugo_stats.json
+
+# Node
 package-lock.json
-resources/_gen/
+node_modules
+
+# Executable may be added to repository
+hugo.exe
+hugo.darwin
+hugo.linux
+
+# Temporary lock file while building
+.hugo_build.lock

README.md

@@ -4,6 +4,7 @@
 
 ***This theme isn't actively maintained, if you want a new feature please file a pull request.***
 
+
 Hugo-Tufte is a minimalist blog-like theme for the
 [static site generator Hugo](https://gohugo.io) that
 attempts to be a faithful implementation of the

layouts/partials/shortcodes/button.html

@@ -0,0 +1,60 @@
+{{- $context := .context }}
+{{- $color := .color | default "" }}
+{{- $content := .content }}
+{{- $href := (trim .href " ") | default "" }}
+{{- $style := .style | default "default" }}
+{{- if and (not $color) (eq (len $color) 0) }}
+  {{- $style = .style | default "transparent" }}
+{{- end }}
+{{- $target := .target | default "" }}
+{{- $type := .type | default "" }}
+{{- $isButton := false }}
+{{- if or (not $href) (strings.HasPrefix $href "javascript:") }}
+  {{- $isButton = true }}
+  {{- $href = substr $href (len "javascript:") }}
+  {{- if not $type }}
+    {{- $type = "button" }}
+  {{- end }}
+{{- else if and (eq (len $target) 0) (or (strings.HasPrefix $href "http://") (strings.HasPrefix $href "https://") ) }}
+  {{- $target = "_blank" }}
+  {{- if isset $context.Site.Params "externallinktarget" }}
+    {{- $target = $context.Site.Params.externalLinkTarget }}
+  {{- end }}
+{{- end }}
+{{- $title := .title | default ($content) | default ($style | T) }}
+{{- $title = trim $title " " }}
+{{- $icon := .icon | default "" }}
+{{- if and (not $icon) (eq (len $icon) 0) }}
+  {{- if eq $style "info" }}{{ $icon = default "info-circle" }}{{ end }}
+  {{- if eq $style "warning" }}{{ $icon = default "exclamation-triangle" }}{{ end }}
+  {{- if eq $style "note" }}{{ $icon = default "exclamation-circle" }}{{ end }}
+  {{- if eq $style "tip" }}{{ $icon = default "lightbulb" }}{{ end }}
+{{- end }}
+{{- $icon = trim $icon " " }}
+{{- if and $icon (not (findRE ".*?\\bfa-\\w.*?" $icon)) }}
+  {{- $icon = printf "fa-fw fas fa-%s" $icon }}
+{{- end }}
+{{- $iconposition := .iconposition | default "left" }}
+{{- with $context }}
+<span class="btn cstyle {{ $style }}"{{ if $color }} style="--VARIABLE-BOX-color: {{ $color }};"{{ end }}>
+  {{- if $isButton }}
+  <button{{ if $href }} onclick="{{ $href | safeJS }}"{{ end }}{{ if gt (len $type) 0 }} type="{{ $type }}"{{ end }}>
+  {{- else }}
+  <a{{ if $href }} href="{{ $href }}"{{ if gt (len $target) 0 }} target="{{ $target }}"{{ end }}{{ end }}>
+  {{- end }}
+    {{- if and $icon (eq $iconposition "left") }}
+    <i class="{{ $icon }}"></i>
+    {{- end }} 
+    {{ $title | safeHTML }}
+    {{- if and $icon (eq $iconposition "right") }}
+    <i class="{{ $icon }}"></i>
+    {{- end }}
+  {{- if $isButton }}
+  </button>
+  {{- else }}
+  </a>
+  {{- end }}
+</span>
+{{- end }}
+
+{{/* https://github.com/McShelby/hugo-theme-relearn/blob/main/layouts/shortcodes/button.html */}}

layouts/shortcodes/button.html

@@ -0,0 +1,15 @@
+{{- $_hugo_config := `{ "version": 1 }` }}
+{{- partial "shortcodes/button.html" (dict
+  "context"       .
+  "color"         (.Get "color")
+  "content"       .Inner
+  "href"          (.Get "href")
+  "icon"          (.Get "icon")
+  "iconposition"  ((.Get "iconposition") | default (.Get "icon-position"))
+  "style"         (.Get "style")
+  "title"         (.Get "title")
+  "target"        (.Get "target")
+  "type"          (.Get "type")
+) }}
+
+{{/* https://github.com/McShelby/hugo-theme-relearn/blob/main/layouts/shortcodes/button.html */}}

layouts/shortcodes/marginnote.html

@@ -1,12 +1,4 @@
 {{ $marginnoteDomIdSuffix := .Ordinal }}
-<label
+<label for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle">&#8853;</label>
-  for="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}"
+<input type="checkbox" id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}" class="margin-toggle"/>
-  class="margin-toggle"
-  >&#8853;
-</label>
-<input
-  type="checkbox"
-  id="marginnote-{{.Page.File.UniqueID}}-{{ $marginnoteDomIdSuffix }}"
-  class="margin-toggle"
-/>
 <span class="marginnote">{{ .Inner | markdownify}}</span>