Merge pull request #572 from gethinode/develop

Refine base layout
Merge branch 'main' into develop
2025-10-17 06:53:11 +00:00 · 2023-10-21 05:57:20 +02:00 · 2023-10-21 05:49:58 +02:00 · 2023-10-21 05:49:14 +02:00 · 2023-10-21 05:48:33 +02:00 · 2023-10-21 05:48:24 +02:00
14 changed files with 106 additions and 40 deletions
--- a/assets/scss/common/_styles.scss
+++ b/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};

--- a/assets/scss/common/_variables-dart.scss
+++ b/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;
--- a/config/_default/params.toml
+++ b/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
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@@ -4,6 +4,7 @@
    enableDarkMode = true
    modes = ["light", "dark"]
    canonifyAssetsURLs = false
+    footerBelowFold = false
    [main.externalLinks]
        cue = true
        tab = true
--- a/exampleSite/hugo_stats.json
+++ b/exampleSite/hugo_stats.json
@@ -166,6 +166,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",
@@ -302,6 +306,10 @@
      "p-2",
      "p-3",
      "p-4",
+      "page-item",
+      "page-link",
+      "pagination",
+      "pagination-terse",
      "pb-2",
      "pb-3",
      "pb-4",
@@ -316,7 +324,7 @@
      "ps-1",
      "ps-3",
      "ps-xl-3",
-      "pt-4",
+      "pt-3",
      "pt-5",
      "pt-md-3",
      "px-4",
@@ -324,6 +332,7 @@
      "py-1",
      "py-2",
      "py-3",
+      "py-5",
      "py-md-1",
      "ratio",
      "ratio-16x9",
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -79,6 +79,7 @@
      "fab",
      "fas",
      "feature",
+      "fixed-top",
      "flex-column",
      "flex-fill",
      "flex-grow-1",
@@ -118,6 +119,7 @@
      "navbar-brand",
      "navbar-collapse",
      "navbar-expand-md",
+      "navbar-fixed-top",
      "navbar-nav",
      "navbar-toggler",
      "no-js",
--- a/layouts/_default/baseof.html
+++ b/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,38 @@

    <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 }}">
-            {{- partial "assets/navbar.html" (dict
-                "page" .
-                "fixed" (string site.Params.navigation.fixed)
-                "color" site.Params.navigation.color
-                "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">
-                {{ block "main" . }}{{ end -}}
+        <div class="d-flex flex-column min-vh-100">
+            <div class="{{ if $fullCover }} fullscreen{{ end }}{{ if .IsHome }} {{ .Site.Params.home.style }}{{ end }}">
+                {{- partial "assets/navbar.html" (dict
+                    "page" .
+                    "fixed" (string site.Params.navigation.fixed)
+                    "color" site.Params.navigation.color
+                    "style" (default "light" site.Params.navigation.style)
+                    "size" (default "md" site.Params.navigation.size))
+                -}}
+                <div class="main-content">
+                    {{ block "featured" . }}{{ end -}}
+                </div>
+                {{ if .Site.Params.main.footerBelowFold }}
+                    <div class="flex-fill">
+                        {{ block "main" . }}{{ end -}}
+                    </div>
+                {{ end }}
            </div>

+            {{ if not .Site.Params.main.footerBelowFold }}
+                <div class="flex-fill">
+                    {{ block "main" . }}{{ end -}}
+                </div>
+                {{- 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) }}
--- a/layouts/_default/list.html
+++ b/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,19 +112,6 @@
        {{ 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">
        {{- if ne $layout "featured" -}}
--- a/layouts/partials/assets/section-header.html
+++ b/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 }}
--- a/layouts/partials/head/stylesheet.html
+++ b/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")))
--- a/layouts/partials/list/featured.html
+++ b/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>
--- a/layouts/shortcodes/button.html
+++ b/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 }}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-beta",
+  "version": "0.21.0-beta2",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@gethinode/hinode",
-      "version": "0.21.0-beta",
+      "version": "0.21.0-beta2",
      "license": "MIT",
      "devDependencies": {
        "@fullhuman/postcss-purgecss": "^5.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.21.0-beta",
+  "version": "0.21.0-beta2",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
Author	SHA1	Message	Date
Mark Dumay	08d462f698	Merge pull request #572 from gethinode/develop Refine base layout	2023-10-21 05:57:20 +02:00
Mark Dumay	d32e615837	Merge branch 'main' into develop	2023-10-21 05:49:58 +02:00
mark	83368cdf3a	Bump package version	2023-10-21 05:49:14 +02:00
mark	45525a6e3c	Set explicit default values	2023-10-21 05:48:33 +02:00
mark	75a082c8df	Update build stats	2023-10-21 05:48:24 +02:00
mark	d3d4d99fe4	Set explicit default values	2023-10-21 05:48:19 +02:00
mark	f05764d4a8	Update build stats	2023-10-21 05:48:08 +02:00
mark	a7822fcd55	Refine base layout	2023-10-21 05:48:00 +02:00
mark	f0a0d2022a	Enable wrapper for button	2023-10-20 14:53:13 +02:00