Merge pull request #220 from gethinode/develop

Fixes

config/_default/.forestry/front_matter/templates/blog-post.yml

@@ -1,25 +0,0 @@
----
-label: Blog post
-hide_body: false
-fields:
-- type: text
-  name: author
-  label: author
-- type: text
-  name: title
-  label: title
-- type: text
-  name: description
-  label: description
-- type: list
-  name: tags
-  label: tags
-- type: datetime
-  name: date
-  label: date
-- type: file
-  name: thumbnail
-  label: thumbnail
-- type: textarea
-  name: credits
-  label: credits

config/_default/.forestry/front_matter/templates/project.yml

@@ -1,25 +0,0 @@
----
-label: Project
-hide_body: false
-fields:
-- type: text
-  name: author
-  label: author
-- type: text
-  name: title
-  label: title
-- type: datetime
-  name: date
-  label: date
-- type: text
-  name: description
-  label: description
-- type: list
-  name: tags
-  label: tags
-- type: file
-  name: thumbnail
-  label: thumbnail
-- type: textarea
-  name: credits
-  label: credits

config/_default/.forestry/settings.yml

@@ -1,40 +0,0 @@
----
-new_page_extension: md
-auto_deploy: false
-admin_path: 
-webhook_url: 
-sections:
-- type: directory
-  path: content/en/blog
-  label: Blog
-  create: all
-  match: "**/*"
-  templates:
-  - blog-post
-- type: directory
-  path: content/en/projects
-  label: Projects
-  create: all
-  match: "**/*"
-  templates:
-  - project
-- type: document
-  path: content/en/about.md
-  label: About
-upload_dir: assets/img
-public_path: "/img"
-front_matter_path: ''
-use_front_matter_path: false
-file_template: ":filename:"
-build:
-  preview_env:
-  - HUGO_ENV=staging
-  - HUGO_VERSION=0.92.2
-  - HUGO_ENABLEGITINFO=true
-  preview_output_directory: public
-  install_dependencies_command: npm install
-  preview_docker_image: forestryio/hugo:node16
-  mount_path: "/srv"
-  working_dir: "/srv"
-  instant_preview_command: npm run start
-version: 0.81.0

layouts/_default/single.html

@@ -1,11 +1,11 @@
 {{- define "partials/header.html" -}}
     {{ if site.Params.navigation.breadcrumb }}{{ partial "breadcrumb.html" . }}{{ end -}}
     {{ if in (slice "docs" "minimal") .Layout }}
-        {{ with .Title }}<p class="display-4 mt-3">{{ . }}</p>{{ end }}
+        {{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
     {{ else }}
         {{ $lastmodstr := (partial "utilities/date.html" (dict "date" .Lastmod "format" "long")) -}}
         {{ $datestr := (partial "utilities/date.html" (dict "date" .Date "format" "long")) -}}
-        {{ with .Title }}<p class="display-4 mt-3">{{ . }}</p>{{ end }}
+        {{ with .Title }}<p class="display-4 mt-5">{{ . }}</p>{{ end }}
         <small class="text-body-secondary text-uppercase">
             {{ $datestr | i18n "postedOnDate" -}}
             {{ if ne $datestr $lastmodstr -}}&nbsp;({{ $lastmodstr | i18n "lastModified" }}){{ end }} &bull;
@@ -92,7 +92,7 @@
             </div>
         </div>
     
-        <div class="container-xxl">
+        <div class="container-xxl px-3 px-xxl-0">
             <div class="row row-cols-md-2 row-cols-lg-3">
                 <div class="col col-md-3 col-lg-2 d-none pt-5 d-md-block sidebar-overflow sticky-top">
                     {{ partial "assets/sidebar" (dict "page" . "menu" $menu "version" $version) }}
@@ -110,7 +110,7 @@
             </div>
         </div>
     {{ else }}
-        <div class="container-xxl">
+        <div class="container-xxl px-3 px-xxl-0">
             <div class="row row-cols-1 row-cols-sm-3">
                 <div class="col col-md-2 d-none d-md-block"></div>
                 <div class="col col-sm-12 col-md-8">

layouts/partials/assets/card-group.html

@@ -87,8 +87,8 @@
 {{- $footer := .footer -}}
 {{- $orientation := .orientation -}}
 
-<div class="container-fluid p-4">
-    {{ with $title }}<p class="display-4 mt-3{{ if and $.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+<div class="container-fluid p-4 px-xxl-0">
+    {{ with $title }}<p class="display-4 mt-3{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
     {{ if $paginate }}
         <div class="row {{ $colGrid }}">
             {{ $paginator := $page.Paginate $list }}

layouts/partials/assets/list.html

@@ -54,7 +54,7 @@
         {{- $odd := eq (mod $index 2) 1 -}}
         <div class="container ratio-section d-flex flex-column">
             {{ if eq $index 0 }}
-                {{ with $title }}<p class="display-4 pt-5{{ if and $.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+                {{ with $title }}<p class="display-4 pt-5{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
             {{ end }}
 
             <div class="row pt-5 pb-5 align-items-center flex-fill row-cols-2">
@@ -79,7 +79,7 @@
         {{- $odd := eq (mod $index 2) 1 -}}
         <div class="container d-flex flex-column">
             {{ if eq $index 0 }}
-                {{ with $title }}<p class="display-4 pt-5{{ if and $.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+                {{ with $title }}<p class="display-4 pt-5{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
             {{ end }}
             <div class="row pt-5 pb-5 align-items-center flex-fill row-cols-2">
                 <div class="col-12 text-center">

layouts/partials/assets/snippet-list.html

@@ -28,7 +28,7 @@
     <div class="container-xxl flex-fill p-0">
         {{ if eq $layout "tabs" }}
             <div class="p-0">
-                {{ with $title }}<p class="display-4 pt-5{{ if and $.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+                {{ with $title }}<p class="display-4 pt-5{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
                 <div class="col-sm-12 col-md-10 col-lg-8 col-xl-6 mx-auto pt-5 pb-5">
                     {{- partial "assets/nav.html" (dict 
                         "page" $page
@@ -42,7 +42,7 @@
                 </div>
             </div>
         {{- else -}}
-            <div class=" p-0">
+            <div class="p-0">
                 {{- partial "assets/list.html" (dict 
                     "page" $page
                     "list" $list

layouts/partials/button.html

@@ -6,7 +6,7 @@
     "state"         Optional state of the button, either "enabled" (default), "disabled", "active", or "inactive".
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
     "color"         Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
+                    "danger", "warning", "info", "light", "dark", "white", or "black".
     "outline"       Optional flag indicating the button should be outlined, either "false" (default) or "true".
     "badge"         Optional positioned badge to display on top of the button.
     "aria-label"    Optional assistive label for the badge.
@@ -40,7 +40,7 @@
 
 {{ $color := "primary" -}}
 {{ with .color }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" $color -}}
 {{ end -}}

layouts/partials/image.html

@@ -132,23 +132,14 @@
 
     {{- range $none := $modes -}}
         {{- if ne $none $mode -}}
-            {{- $outerClass = printf "%s d-none-%s" $outerClass $none -}}
+            {{- $outerClass = printf "%s d-none-%s" (or $outerClass "") $none -}}
         {{- end -}}
     {{- end -}}
 
     {{- if $caption -}}
-        <figure class="figure {{ $outerClass }}">
-            <img class="figure-img img-fluid {{ $innerClass }}"
-            {{ with $imgset -}}
-            srcset="{{ . }}"
-            sizes="100vw"
-            {{- end }}
-            src="{{ $fallbackURL }}"
-            alt="{{ $title }}">
-            <figcaption class="figure-caption">{{ $caption | safeHTML }}</figcaption>
-        </figure>
-    {{- else -}}
-        <div class="{{ with $ratio }}ratio ratio-{{ . }}{{ end }} {{ $outerClass }}">
+        <figure {{ with $outerClass }}class="{{ . }}"{{ end }}>
+    {{ end }}
+        <div class="{{ with $ratio }}ratio ratio-{{ . }}{{ end }}{{ if not $caption }} {{ $outerClass }}{{ end }}">
             <img class="img-fluid {{ $innerClass }}"
                 {{ with $imgset -}}
                 srcset="{{ . }}"
@@ -157,7 +148,10 @@
                 src="{{ $fallbackURL }}"
                 alt="{{ $title }}">
         </div>
-    {{- end -}}
+    {{- if $caption -}}
+        <figcaption class="figure-caption">{{ $caption | safeHTML }}</figcaption>
+    </figure>
+{{- end -}}
 {{- end -}}
 
 <!-- Initiate the regular or color-mode image -->

layouts/shortcodes/alert.html

@@ -1,14 +1,14 @@
 <!-- 
     Displays an alert. The shortcode supports the following arguments:
     "color":        Optional theme color of the alert, either "primary" (default), "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white" or "black", "body", or "body-tertiary".
+                    "warning", "info", "light", "dark", "white" or "black".
     "dismissible"   Optional flag to indicate the alert is dismissible, defaults to false.
     "icon"          Optional class and name of a Font Awesome icon to include.
 -->
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "body" "body-tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $color = "primary" -}}

layouts/shortcodes/button.html

@@ -6,7 +6,7 @@
     "state"         Optional state of the button, either "enabled" (default), "disabled", "active", or "inactive".
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
     "color":        Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
+                    "danger", "warning", "info", "light", "dark", "white", or "black".
     "outline"       Optional flag indicating the button should be outlined, either "false" (default) or "true".
     "badge"         Optional positioned badge to display on top of the button.
     "aria-label"    Optional label for the badge.
@@ -42,7 +42,7 @@
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $error = true }}

layouts/shortcodes/spinner.html

@@ -1,14 +1,14 @@
 <!-- 
     Displays a spinner. The shortcode supports the following arguments:
     "color":        Optional theme color of the alert, either "primary" (default), "secondary", "success", "danger",
-                    "warning", "info", "light", "dark", "white", "black", "body", or "body-tertiary".
+                    "warning", "info", "light", "dark", "white", or "black".
     "grow"          Optional flag to indicate the spinner is growing instead of rotating, defaults to false.
     "class":        Optional class attribute of the spinner wrapping element, e.g. “text-center”.
 -->
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $color = "primary" -}}

layouts/shortcodes/tooltip.html

@@ -1,7 +1,7 @@
 <!-- 
     Displays a tooltip for a link. The shortcode supports the following arguments:
     "color":        Optional theme color of the element, either "primary" (default), "secondary", "success",
-                    "danger", "warning", "info", "light", "dark", "white",  "black", "body", or "body-tertiary".
+                    "danger", "warning", "info", "light", "dark", "white", or "black".
     "title"         Required text to display in the tooltip.
     "href"          Required address for the button or hyperlink.
     "placement"     Optional position of the tooltip: "top" (default), "bottom", "left", or "right". 
@@ -18,7 +18,7 @@
 
 {{ $color := "primary" -}}
 {{ with .Get "color" }}{{ $color = . }}{{ end -}}
-{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" "body" "body-tertiary" -}}
+{{ $supportedColors := slice "primary" "secondary" "success" "danger" "warning" "info" "light" "dark" "white" "black" -}}
 {{ if not (in $supportedColors $color) -}}
     {{ errorf "Invalid value for param 'color': %s" .Position -}}
     {{ $error = true }}

layouts/tags/list.html

@@ -1,9 +1,9 @@
 {{ define "main" }}
-    <div class="container-fluid">
-        <div class="row row-cols-1 row-cols-sm-3 align-items-center p-3">
+    <div class="container-xxl px-3 px-xxl-0">
+        <div class="row row-cols-1 row-cols-sm-3">
             <div class="col col-md-2 d-none d-md-block"></div>
             <div class="col col-sm-12 col-md-8">
-                <p class="display-4">{{ .Name | humanize }}</p>
+                <p class="display-4 mt-5">{{ .Name | humanize }}</p>
 
                 {{ if eq .Kind "taxonomy" }}
                     <div class="row mt-5"></div>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.12.0-alpha2",
+  "version": "0.12.0-alpha4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.12.0-alpha2",
+      "version": "0.12.0-alpha4",
       "license": "MIT",
       "devDependencies": {
         "@fortawesome/fontawesome-free": "^6.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.12.0-alpha2",
+  "version": "0.12.0-alpha4",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",