Merge pull request #573 from gethinode/develop

Fix alignment of 404 message

assets/scss/common/_styles.scss

@@ -15,6 +15,12 @@ a:active {
     min-height: 100vh;
 }
 
+.fullcover {
+    --navbar-height: #{$navbar-height};
+
+    min-height: calc(100vh - var(--navbar-height));
+}
+
 .fullscreen {
     --navbar-offset: #{$navbar-offset};
 

assets/scss/common/_variables-dart.scss

@@ -18,6 +18,7 @@ strong {
     font-weight:                600 if($enable-important-utilities, !important, null);
 }
 
+$navbar-height:                 h.$navbar-height;
 $navbar-offset:                 h.$navbar-offset;
 $primary:                       h.$primary;
 $secondary:                     h.$secondary;

config/_default/params.toml

@@ -6,6 +6,7 @@
     modes = ["light", "dark"]
     canonifyAssetsURLs = false
     endorse = true
+    footerBelowFold = false
     [main.externalLinks]
         cue = false
         tab = false
@@ -59,6 +60,7 @@
     anchor = true
     logo = "/img/logo_icon.svg"
     color = "body"
+    fixed = true
     offset = "5.5rem"
     search = true
     searchModal = false

exampleSite/config/_default/params.toml

@@ -4,6 +4,7 @@
     enableDarkMode = true
     modes = ["light", "dark"]
     canonifyAssetsURLs = false
+    footerBelowFold = false
     [main.externalLinks]
         cue = true
         tab = true

exampleSite/go.sum

@@ -33,6 +33,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.3.4 h1:oY+YQ0JiJuhFQNrk9XgFdg0NMsTUQPXNfnILp4ia4r4=
 github.com/gethinode/mod-leaflet v0.3.4/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.5 h1:69Bv/6zRXhbcTzo7TMr58h3ry47srHRpM1k81LrLbYU=

exampleSite/hugo_stats.json

@@ -54,7 +54,6 @@
       "alert",
       "alert-danger",
       "alert-dismissible",
-      "align-content-center",
       "align-items-center",
       "align-items-end",
       "align-items-start",
@@ -166,6 +165,10 @@
       "fa-2xs",
       "fa-4x",
       "fa-activity",
+      "fa-angle-left",
+      "fa-angle-right",
+      "fa-angles-left",
+      "fa-angles-right",
       "fa-arrow-left",
       "fa-arrow-right",
       "fa-bootstrap",
@@ -199,13 +202,11 @@
       "fab",
       "fade",
       "fas",
-      "feature",
       "figure-caption",
       "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
       "font-monospace",
       "footer",
       "form-control",
@@ -302,6 +303,10 @@
       "p-2",
       "p-3",
       "p-4",
+      "page-item",
+      "page-link",
+      "pagination",
+      "pagination-terse",
       "pb-2",
       "pb-3",
       "pb-4",
@@ -316,7 +321,7 @@
       "ps-1",
       "ps-3",
       "ps-xl-3",
-      "pt-4",
+      "pt-3",
       "pt-5",
       "pt-md-3",
       "px-4",
@@ -324,6 +329,7 @@
       "py-1",
       "py-2",
       "py-3",
+      "py-5",
       "py-md-1",
       "ratio",
       "ratio-16x9",

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/gethinode/mod-bootstrap v1.2.1 // indirect
 	github.com/gethinode/mod-flexsearch v1.5.1 // indirect
 	github.com/gethinode/mod-fontawesome v1.5.0 // indirect
-	github.com/gethinode/mod-katex v1.0.3 // indirect
+	github.com/gethinode/mod-katex v1.0.4 // indirect
 	github.com/gethinode/mod-leaflet v0.3.5 // indirect
 	github.com/gethinode/mod-lottie v1.3.0 // indirect
 )

go.sum

@@ -64,6 +64,8 @@ github.com/gethinode/mod-katex v1.0.2 h1:pIG4n3qLl/IVe7BEiwn+GL8r5lOCtF6FDxlcrPK
 github.com/gethinode/mod-katex v1.0.2/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-katex v1.0.3 h1:fvlUWqcUQqv2zRNM2kfmJ6GhXA816Tl1nfVrUkmBStI=
 github.com/gethinode/mod-katex v1.0.3/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
+github.com/gethinode/mod-katex v1.0.4 h1:NozgWPFnHhx1W+E9DnwMTRpvxPbdqdANEtwp9N3/mj8=
+github.com/gethinode/mod-katex v1.0.4/go.mod h1:byAfpI3wuqNJIooTGVEGc1cjBhhCy4+CcK1H6495MYg=
 github.com/gethinode/mod-leaflet v0.2.3 h1:QQI4h+IH0jZ7fx4q0um2YIEiYBoW3OAfW8qHzbRCDPk=
 github.com/gethinode/mod-leaflet v0.2.3/go.mod h1:uGggt87x4Fw7wBoJpSiUvNkYg+s/Ujne7klAX2rxMRk=
 github.com/gethinode/mod-leaflet v0.3.1 h1:H5MaOa+BB1KuVw7abTqfIn/SNzzRsAyx/WQoSe+2Ykc=

hugo_stats.json

@@ -27,10 +27,10 @@
     ],
     "classes": [
       "active",
-      "align-content-center",
       "align-items-center",
       "align-self-center",
       "bg-body",
+      "bg-info",
       "bg-opacity-10",
       "bg-primary",
       "bottom-0",
@@ -78,17 +78,19 @@
       "fa-sun",
       "fab",
       "fas",
-      "feature",
+      "fixed-top",
       "flex-column",
       "flex-fill",
       "flex-grow-1",
-      "flex-wrap",
+      "flex-row",
       "footer",
       "form-control",
       "fs-3",
       "fs-5",
+      "fullscreen",
       "fw-30",
       "fw-bold",
+      "h-100",
       "hstack",
       "img-fluid",
       "img-wrap",
@@ -118,6 +120,7 @@
       "navbar-brand",
       "navbar-collapse",
       "navbar-expand-md",
+      "navbar-fixed-top",
       "navbar-nav",
       "navbar-toggler",
       "no-js",

layouts/404.html

@@ -1,13 +1,15 @@
 {{ define "main"}}
-    <div class="container-xxl flex-fill d-flex align-content-center flex-wrap feature">
+    <div class="d-flex flex-fill">
-        <div class="w-100 text-center">
+        <div class="container-xxl my-auto">
-            <span class="text-secondary fw-bold">
+            <div class="text-center">
-                {{ partial "assets/icon.html" (dict "icon" "fa face-frown fa-10x") }}
+                <span class="text-secondary fw-bold">
-                <p class="display-1 mt-3 fw-bold">404</p>
+                    {{ partial "assets/icon.html" (dict "icon" "fa face-frown fa-10x") }}
-                <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
+                    <p class="display-1 mt-3 fw-bold">404</p>
-            </span>
+                    <p class="fs-3">{{ T "pageNotFoundTitle" }}</p>
-            {{- $home := printf "<a href=\"%s\">%s</a>" ("/" | relLangURL) (T "pageNotFoundHome") -}}
+                </span>
-            <p>{{ T "pageNotFound" $home | safeHTML }}</p>
+                {{- $home := printf "<a href=\"%s\">%s</a>" ("/" | relLangURL) (T "pageNotFoundHome") -}}
+                <p>{{ T "pageNotFound" $home | safeHTML }}</p>
+            </div>
         </div>
     </div>
 {{ end }}

layouts/_default/baseof.html

@@ -39,7 +39,20 @@
     {{- errorf "Bootstrap is a required module, please add it to 'modules.core' in your site parameters" -}}
 {{- end -}}
 
+{{- /* Define section headings */ -}}
+{{- $headings := slice -}}
+{{ if .Fragments }}
+    {{ $headings = $headings | append .Title }}
+    {{- range .Fragments.Headings }}
+        {{- range .Headings }}
+            {{- $headings = $headings | append .Title -}}
+        {{- end -}}
+    {{- end -}}
+{{ end }}
+{{- $.Scratch.Set "headings" $headings -}}
+
 {{- $section := .Section }}
+{{- $fullCover := or (or (and .IsHome .Site.Params.home.fullCover) .Page.Params.fullCover) .Site.Params.main.footerBelowFold }}
 
 <!doctype html>
 <html lang="{{ .Site.Language.Lang }}" class="no-js">
@@ -49,22 +62,34 @@
 
     <body>
         {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}}
-        <div class="d-flex flex-column min-vh-100{{ if .IsHome }}{{ with .Site.Params.home.style }} {{ . }}{{ end }}{{ end }}">
+        <div class="d-flex flex-column min-vh-100">
-            {{- partial "assets/navbar.html" (dict
+            <div class="d-flex flex-column {{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
-                "page" .
+                {{- partial "assets/navbar.html" (dict
-                "fixed" (string site.Params.navigation.fixed)
+                    "page" .
-                "color" site.Params.navigation.color
+                    "fixed" (string site.Params.navigation.fixed)
-                "style" (default "light" site.Params.navigation.style)
+                    "color" site.Params.navigation.color
-                "size" (default "md" site.Params.navigation.size))
+                    "style" (default "light" site.Params.navigation.style)
-            -}}
+                    "size" (default "md" site.Params.navigation.size))
-
+                -}}
-            <div class="flex-fill main-content{{ if .Site.Params.main.footerBelowFold }} fullscreen{{ end }} pb-4">
+                <div class="main-content">
-                {{ block "main" . }}{{ end -}}
+                    {{ block "featured" . }}{{ end -}}
+                </div>
+                {{ if .Site.Params.main.footerBelowFold }}
+                    {{ block "main" . }}{{ end -}}
+                {{ end }}
             </div>
 
+            {{ if not .Site.Params.main.footerBelowFold }}
+                {{ block "main" . }}{{ end -}}
+                {{- partial "footer/social.html" . -}}
+                {{- partial "footer/footer.html" . -}}
+            {{ end }}
+        </div>
+
+        {{ if .Site.Params.main.footerBelowFold }}
             {{- partial "footer/social.html" . -}}
             {{- partial "footer/footer.html" . -}}
-        </div>
+        {{ end }}
 
         {{- partial "footer/toast-container.html" . -}}
         {{- partialCached "footer/scripts.html" (dict "header" false "page" . "core" true) }}

layouts/_default/list.html

@@ -1,16 +1,12 @@
-{{- define "main" -}}
+{{- define "featured" }}
+    {{- $headings := $.Scratch.Get "headings" -}}
+
     {{- $page := . -}}
-    {{- $orientation :=  site.Params.list.feature.orientation | default "horizontal" -}}
+    {{- $orientation := site.Params.list.feature.orientation | default "horizontal" -}}
     {{- $width := site.Params.list.feature.width | default 6 -}}
     {{- $justify := site.Params.list.feature.justify | default "center" -}}
     {{- $align := site.Params.list.feature.align | default "center" -}}
-    {{- $sections := slice -}}
-    {{- $sections = $sections | append $page.Type -}}
-    {{ with $page.Params.sections }}
-        {{ $sections = $sections | append . }}
-    {{ end }}
     {{- $actions := $page.Params.actions -}}
-    {{- $headings := slice -}}
     {{- $layout := $page.Params.layout -}}
 
     {{ if $page.IsHome }}
@@ -19,6 +15,33 @@
         {{- $justify = or site.Params.home.feature.justify $justify -}}
         {{- $align = or site.Params.home.feature.align $align -}}
         {{- $actions = (or $actions site.Params.featured.actions) -}}
+    {{ end }}
+
+    {{/* Display featured section */}}
+    {{- if or (eq $layout "featured") $page.IsHome -}}
+        {{- partial "list/featured.html" (dict 
+            "page" .
+            "headings" $headings
+            "actions" $actions
+            "orientation" $orientation
+            "width" $width
+            "justify" $justify
+            "align" $align) 
+        -}}
+    {{- end -}}
+{{ end }}
+
+{{- define "main" -}}
+    {{- $page := . -}}
+    {{- $sections := slice -}}
+    {{- $sections = $sections | append $page.Type -}}
+    {{ with $page.Params.sections }}
+        {{ $sections = $sections | append . }}
+    {{ end }}
+    {{- $headings := slice -}}
+    {{- $layout := $page.Params.layout -}}
+
+    {{ if $page.IsHome }}
         {{- if not $page.Params.sections -}}
             {{- with site.Params.home.sections }}
                 {{ $sections = $sections | append . }}
@@ -89,21 +112,8 @@
         {{ end }}
     {{- end -}}
 
-    {{/* Display featured section */}}
-    {{- if or (eq $layout "featured") $page.IsHome -}}
-        {{- partial "list/featured.html" (dict 
-            "page" .
-            "headings" $headings
-            "actions" $actions
-            "orientation" $orientation
-            "width" $width
-            "justify" $justify
-            "align" $align) 
-        -}}
-    {{- end -}}
-
     {{/* Display main content */}}
-    <div class="container-xxl px-4 px-xxl-0">
+    <div class="container-xxl flex-fill px-4 px-xxl-0">
         {{- if ne $layout "featured" -}}
             {{ if and (not $page.IsHome) site.Params.navigation.breadcrumb }}
                 <div>{{ partial "assets/breadcrumb.html" $page }}</div>

layouts/_default/single.html

@@ -45,7 +45,7 @@
         </div>
     {{ end }}
 
-    <div class="container-xxl p-4 px-xxl-0">
+    <div class="container-xxl flex-fill p-4 px-xxl-0">
         {{ if and $menu $hasSidebar -}}
             <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">

layouts/partials/assets/section-header.html

@@ -20,6 +20,6 @@
     {{- end -}}
 {{- end -}}
 
-{{ with $title }}<p id="{{ anchorize . }}" class="display-4 pt-4{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
+{{ with $title }}<p id="{{ anchorize . }}" class="display-4 py-5{{ if and page.IsHome site.Params.home.centerHeadline }} text-center{{ end }}">{{ . }}</p>{{ end }}
 {{ with $description }} <p class="lead mb-5">{{ . }}</p>{{ end }}
 {{ $content }}

layouts/partials/head/stylesheet.html

@@ -39,6 +39,7 @@
     "danger"                  (default "#dc3545" site.Params.style.danger)
     "light"                   (default "#f8f9fa" site.Params.style.light)
     "dark"                    (default "#212529" site.Params.style.dark)
+    "navbar-height"           (site.Params.navigation.offset | default "4em")
     "navbar-offset"           $navbarOffset
     "enable-dark-mode"        (printf "%t" ((default true site.Params.main.enableDarkMode)))
     "import-fonts"            (printf "%t" (not (hasPrefix (lower site.Params.style.themeFontPath) "http")))

layouts/partials/list/featured.html

@@ -61,7 +61,7 @@
 {{- end -}}
 
 <div class="container-fluid p-0 {{ with site.Params.home.feature.color }} bg-{{ . }} bg-opacity-{{ site.Params.style.themeOpacity | default "25" | safeHTML }}{{ end }}">
-    <div class="container-xxl {{ if $breadcrumb }} pb-4 px-4 {{ else }} p-4 {{ end }} px-xxl-0 {{ if site.Params.home.fullCover }} fullscreen{{ end }} d-flex flex-column">
+    <div class="container-xxl {{ if $breadcrumb }} pb-4 px-4 {{ else }} p-4 {{ end }} px-xxl-0 {{ if site.Params.home.fullCover }} fullcover{{ end }} d-flex flex-column">
         {{ if $breadcrumb }}
             <div>{{ partial "assets/breadcrumb.html" $page }}</div>
         {{ end -}}
@@ -74,7 +74,7 @@
                 </div>
             </div>
         {{ else }}
-            <div class="flex-fill row row-cols-1 row-cols-md-2 justify-content-{{ $justify }}">
+            <div class="row row-cols-1 row-cols-md-2 justify-content-{{ $justify }} flex-fill">
                 <div class="col col-12 col-md-{{ $width }} order-1 order-md-0 my-md-auto">
                     {{ partial "partials/list/featured-body.html" (dict "page" $page "headings" $headings "orientation" $orientation "actions" $actions "align" $align) }}
                 </div>

layouts/shortcodes/button.html

@@ -27,6 +27,7 @@
     "tab"           Optional flag to indicate if an external link should open in a new tab, defaults to setting
                     "main.externalLinks.tab" in the site's parameters.
     "spacing"       Optional flag to add spacing to the inline button, defaults to "true".
+    "wrapper"       Optional element to wrap the button.
 -->
 
 {{ $error := false }}
@@ -140,6 +141,10 @@
         "spacing" $spacing)
     -}}
 
+    {{ with .Get "wrapper" }}
+        {{ $output = printf `<div class="%s">%s</div>` . $output }}
+    {{ end }}
+
     {{- if .Parent -}}
         {{ $current := .Parent.Scratch.Get "inner" }}
         {{ if $current }}

layouts/tags/list.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-    <div class="container-xxl px-4 px-xxl-0">
+    <div class="container-xxl flex-fill px-4 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">

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.21.0-beta",
+  "version": "0.21.0-beta3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.21.0-beta",
+      "version": "0.21.0-beta3",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

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