Skip to content
Merged

Develop #1826

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exampleSite/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/gethinode/mod-blocks v1.15.2 // indirect
github.com/gethinode/mod-bootstrap-icons v1.4.1 // indirect
github.com/gethinode/mod-cookieyes/v2 v2.2.6 // indirect
github.com/gethinode/mod-docs v1.6.3 // indirect
github.com/gethinode/mod-docs v1.7.0 // indirect
github.com/gethinode/mod-fontawesome/v5 v5.1.0 // indirect
github.com/gethinode/mod-utils/v5 v5.19.1 // indirect
github.com/twbs/icons v1.13.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exampleSite/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/gethinode/mod-bootstrap-icons v1.4.1 h1:XgP3VU8YiH3FLbF35yltddZKoD6gM
github.com/gethinode/mod-bootstrap-icons v1.4.1/go.mod h1:Zerq06ruLGV3V2IcvG1UDaJzCrNN4KcfgJAM3LXgXm0=
github.com/gethinode/mod-cookieyes/v2 v2.2.6 h1:/DQm8OYpms0On8wuosQER47TplVu/3z7MZHwbBKXCAg=
github.com/gethinode/mod-cookieyes/v2 v2.2.6/go.mod h1:tULb7D7CoTycGUyL7ryqHJKaX11XuL2SN+XwP7/DI0Y=
github.com/gethinode/mod-docs v1.6.3 h1:D+Z0XLI4p62BGe8XpRSLgh4/Rwr42KP5zhgOIRfG/xQ=
github.com/gethinode/mod-docs v1.6.3/go.mod h1:ru1w0fHqFocjDIMV0dm40OwhBw5k4UncCS8iO/1S5kI=
github.com/gethinode/mod-docs v1.7.0 h1:xNk87WXBlUfYTKbr6OW2EXYX8x62XIz5iPcMm4P9J5M=
github.com/gethinode/mod-docs v1.7.0/go.mod h1:ru1w0fHqFocjDIMV0dm40OwhBw5k4UncCS8iO/1S5kI=
github.com/gethinode/mod-fontawesome/v5 v5.1.0 h1:u3ntQMe1fGntcrljxrbZXA9Q0z2WHlmbPT0sL+Uw1o8=
github.com/gethinode/mod-fontawesome/v5 v5.1.0/go.mod h1:b9nG1pel6LIWiNyb0kZAmyhLo2rrx4dvG2xyoD8tDlk=
github.com/gethinode/mod-utils/v5 v5.19.1 h1:peyYRxjIf8d84mt435veKaiO5nrIBXQ5xrHKHqcJehw=
Expand Down
167 changes: 84 additions & 83 deletions exampleSite/hugo_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@
"multi-file-collapse-0",
"multi-file-collapse-1",
"multi-file-collapse-11",
"multi-file-collapse-14",
"multi-file-collapse-16",
"multi-file-collapse-2",
"multi-file-collapse-3",
"multi-file-collapse-4",
Expand Down Expand Up @@ -869,7 +869,7 @@
"body-file-collapse-0",
"body-file-collapse-1",
"body-file-collapse-11",
"body-file-collapse-14",
"body-file-collapse-16",
"body-file-collapse-2",
"body-file-collapse-3",
"body-file-collapse-4",
Expand Down Expand Up @@ -976,10 +976,10 @@
"docs",
"dropdown-callout-1",
"dropdown-nav-0",
"dropdown-panel-1615d6ea8466def9b4db9acbcbf0fd1a",
"dropdown-panel-3145d94421a9c7542bcd8a147e79231b",
"dropdown-panel-3dd1c3872fe26aa81c22e18aceb5ef7f",
"dropdown-panel-471be3b82d9df135cb03d5f06be6b5da",
"dropdown-panel-107abeeeea8d5210109fc6b7584277b9",
"dropdown-panel-15af0aa7416802aa0e8305502cf763e0",
"dropdown-panel-1c9a769f39353188911e3759a1b85b66",
"dropdown-panel-cf8574567d9048b6e370bb7e311b7114",
"dropdown-pills-1",
"dropdown-tabs-1",
"dropdown-underline-1",
Expand All @@ -1002,11 +1002,11 @@
"fab-whatsapp",
"fab-x-twitter",
"faq",
"faq-81261fe20036c11936623758d1e9dcb6",
"faq-81261fe20036c11936623758d1e9dcb6-heading-faq-81261fe20036c11936623758d1e9dcb6",
"faq-81261fe20036c11936623758d1e9dcb6-item-0",
"faq-81261fe20036c11936623758d1e9dcb6-item-1",
"faq-81261fe20036c11936623758d1e9dcb6-item-2",
"faq-ddd7e72d5ced00c02332f2bee8515939",
"faq-ddd7e72d5ced00c02332f2bee8515939-heading-faq-ddd7e72d5ced00c02332f2bee8515939",
"faq-ddd7e72d5ced00c02332f2bee8515939-item-0",
"faq-ddd7e72d5ced00c02332f2bee8515939-item-1",
"faq-ddd7e72d5ced00c02332f2bee8515939-item-2",
"far-square",
"fas-1",
"fas-2",
Expand Down Expand Up @@ -1062,7 +1062,7 @@
"footer-file-collapse-0",
"footer-file-collapse-1",
"footer-file-collapse-11",
"footer-file-collapse-14",
"footer-file-collapse-16",
"footer-file-collapse-2",
"footer-file-collapse-3",
"footer-file-collapse-4",
Expand Down Expand Up @@ -1154,10 +1154,10 @@
"nav-0-btn-2",
"nav-callout-1",
"nav-nav-0",
"nav-panel-1615d6ea8466def9b4db9acbcbf0fd1a",
"nav-panel-3145d94421a9c7542bcd8a147e79231b",
"nav-panel-3dd1c3872fe26aa81c22e18aceb5ef7f",
"nav-panel-471be3b82d9df135cb03d5f06be6b5da",
"nav-panel-107abeeeea8d5210109fc6b7584277b9",
"nav-panel-15af0aa7416802aa0e8305502cf763e0",
"nav-panel-1c9a769f39353188911e3759a1b85b66",
"nav-panel-cf8574567d9048b6e370bb7e311b7114",
"nav-pills-1",
"nav-tabs-1",
"nav-underline-1",
Expand Down Expand Up @@ -1193,30 +1193,30 @@
"over-mij",
"overview",
"page-link",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-0",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-1",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-2",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-btn-0",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-btn-1",
"panel-1615d6ea8466def9b4db9acbcbf0fd1a-btn-2",
"panel-3145d94421a9c7542bcd8a147e79231b-0",
"panel-3145d94421a9c7542bcd8a147e79231b-1",
"panel-3145d94421a9c7542bcd8a147e79231b-2",
"panel-3145d94421a9c7542bcd8a147e79231b-btn-0",
"panel-3145d94421a9c7542bcd8a147e79231b-btn-1",
"panel-3145d94421a9c7542bcd8a147e79231b-btn-2",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-0",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-1",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-2",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-btn-0",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-btn-1",
"panel-3dd1c3872fe26aa81c22e18aceb5ef7f-btn-2",
"panel-471be3b82d9df135cb03d5f06be6b5da-0",
"panel-471be3b82d9df135cb03d5f06be6b5da-1",
"panel-471be3b82d9df135cb03d5f06be6b5da-2",
"panel-471be3b82d9df135cb03d5f06be6b5da-btn-0",
"panel-471be3b82d9df135cb03d5f06be6b5da-btn-1",
"panel-471be3b82d9df135cb03d5f06be6b5da-btn-2",
"panel-107abeeeea8d5210109fc6b7584277b9-0",
"panel-107abeeeea8d5210109fc6b7584277b9-1",
"panel-107abeeeea8d5210109fc6b7584277b9-2",
"panel-107abeeeea8d5210109fc6b7584277b9-btn-0",
"panel-107abeeeea8d5210109fc6b7584277b9-btn-1",
"panel-107abeeeea8d5210109fc6b7584277b9-btn-2",
"panel-15af0aa7416802aa0e8305502cf763e0-0",
"panel-15af0aa7416802aa0e8305502cf763e0-1",
"panel-15af0aa7416802aa0e8305502cf763e0-2",
"panel-15af0aa7416802aa0e8305502cf763e0-btn-0",
"panel-15af0aa7416802aa0e8305502cf763e0-btn-1",
"panel-15af0aa7416802aa0e8305502cf763e0-btn-2",
"panel-1c9a769f39353188911e3759a1b85b66-0",
"panel-1c9a769f39353188911e3759a1b85b66-1",
"panel-1c9a769f39353188911e3759a1b85b66-2",
"panel-1c9a769f39353188911e3759a1b85b66-btn-0",
"panel-1c9a769f39353188911e3759a1b85b66-btn-1",
"panel-1c9a769f39353188911e3759a1b85b66-btn-2",
"panel-cf8574567d9048b6e370bb7e311b7114-0",
"panel-cf8574567d9048b6e370bb7e311b7114-1",
"panel-cf8574567d9048b6e370bb7e311b7114-2",
"panel-cf8574567d9048b6e370bb7e311b7114-btn-0",
"panel-cf8574567d9048b6e370bb7e311b7114-btn-1",
"panel-cf8574567d9048b6e370bb7e311b7114-btn-2",
"panels",
"persona",
"pie-chart",
Expand All @@ -1234,50 +1234,50 @@
"powershell",
"premier-article",
"preview",
"preview-0fdfe63c2d5291d27b6d35ba04c2bda1-desktop",
"preview-0fdfe63c2d5291d27b6d35ba04c2bda1-mobile",
"preview-0fdfe63c2d5291d27b6d35ba04c2bda1-tablet",
"preview-0f830094e9e9371d692dd5930c4dbcd7-desktop",
"preview-0f830094e9e9371d692dd5930c4dbcd7-desktop-tab",
"preview-0f830094e9e9371d692dd5930c4dbcd7-mobile",
"preview-0f830094e9e9371d692dd5930c4dbcd7-mobile-tab",
"preview-0f830094e9e9371d692dd5930c4dbcd7-tablet",
"preview-0f830094e9e9371d692dd5930c4dbcd7-tablet-tab",
"preview-1",
"preview-2",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-desktop",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-desktop-tab",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-mobile",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-mobile-tab",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-tablet",
"preview-2e5e12aed34bf9a53f1d1c19f9e1e9f1-tablet-tab",
"preview-36552167477315d333a0b97d6644e964-desktop",
"preview-36552167477315d333a0b97d6644e964-desktop-tab",
"preview-36552167477315d333a0b97d6644e964-mobile",
"preview-36552167477315d333a0b97d6644e964-mobile-tab",
"preview-36552167477315d333a0b97d6644e964-tablet",
"preview-36552167477315d333a0b97d6644e964-tablet-tab",
"preview-4ed8100cc971df5141abfc24731a5e5b-desktop",
"preview-4ed8100cc971df5141abfc24731a5e5b-mobile",
"preview-4ed8100cc971df5141abfc24731a5e5b-tablet",
"preview-6977db0c62f746b249a005c1ea833469-desktop",
"preview-6977db0c62f746b249a005c1ea833469-desktop-tab",
"preview-6977db0c62f746b249a005c1ea833469-mobile",
"preview-6977db0c62f746b249a005c1ea833469-mobile-tab",
"preview-6977db0c62f746b249a005c1ea833469-tablet",
"preview-6977db0c62f746b249a005c1ea833469-tablet-tab",
"preview-6b2c5682d47cb75d4f61500ba462ba23-desktop",
"preview-6b2c5682d47cb75d4f61500ba462ba23-desktop-tab",
"preview-6b2c5682d47cb75d4f61500ba462ba23-mobile",
"preview-6b2c5682d47cb75d4f61500ba462ba23-mobile-tab",
"preview-6b2c5682d47cb75d4f61500ba462ba23-tablet",
"preview-6b2c5682d47cb75d4f61500ba462ba23-tablet-tab",
"preview-7b0c94c84b65c549f2f476773e097b21-desktop",
"preview-7b0c94c84b65c549f2f476773e097b21-desktop-tab",
"preview-7b0c94c84b65c549f2f476773e097b21-mobile",
"preview-7b0c94c84b65c549f2f476773e097b21-mobile-tab",
"preview-7b0c94c84b65c549f2f476773e097b21-tablet",
"preview-7b0c94c84b65c549f2f476773e097b21-tablet-tab",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-desktop",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-desktop-tab",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-mobile",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-mobile-tab",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-tablet",
"preview-b566dbb7ae9f38b2e023a8385d340b1f-tablet-tab",
"preview-2225bb1648391d33ad944e7e7c0edb2c-desktop",
"preview-2225bb1648391d33ad944e7e7c0edb2c-desktop-tab",
"preview-2225bb1648391d33ad944e7e7c0edb2c-mobile",
"preview-2225bb1648391d33ad944e7e7c0edb2c-mobile-tab",
"preview-2225bb1648391d33ad944e7e7c0edb2c-tablet",
"preview-2225bb1648391d33ad944e7e7c0edb2c-tablet-tab",
"preview-286cc4d3243a304dc9de882988b0990e-desktop",
"preview-286cc4d3243a304dc9de882988b0990e-desktop-tab",
"preview-286cc4d3243a304dc9de882988b0990e-mobile",
"preview-286cc4d3243a304dc9de882988b0990e-mobile-tab",
"preview-286cc4d3243a304dc9de882988b0990e-tablet",
"preview-286cc4d3243a304dc9de882988b0990e-tablet-tab",
"preview-726d5340a163d910626e3e547957d967-desktop",
"preview-726d5340a163d910626e3e547957d967-desktop-tab",
"preview-726d5340a163d910626e3e547957d967-mobile",
"preview-726d5340a163d910626e3e547957d967-mobile-tab",
"preview-726d5340a163d910626e3e547957d967-tablet",
"preview-726d5340a163d910626e3e547957d967-tablet-tab",
"preview-76018f13aaf30c01c431b7e2707f02dc-desktop",
"preview-76018f13aaf30c01c431b7e2707f02dc-mobile",
"preview-76018f13aaf30c01c431b7e2707f02dc-tablet",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-desktop",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-desktop-tab",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-mobile",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-mobile-tab",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-tablet",
"preview-9bcf9df0dcbef9914e5c2e5b07d2be90-tablet-tab",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-desktop",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-desktop-tab",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-mobile",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-mobile-tab",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-tablet",
"preview-bdc886b5269dcbd4d78a1fd2daeba34b-tablet-tab",
"preview-d7ec1f973bf9b25e2b03d387220cea20-desktop",
"preview-d7ec1f973bf9b25e2b03d387220cea20-mobile",
"preview-d7ec1f973bf9b25e2b03d387220cea20-tablet",
"preview-unavailable",
"preview-unavailable-alert-only",
"preview-with-specific-device",
Expand Down Expand Up @@ -1322,6 +1322,7 @@
"stacking-icons",
"state-diagram",
"stateful-buttons",
"static-assets",
"strict-aspect-ratio",
"styled-link",
"styles-type",
Expand All @@ -1340,7 +1341,7 @@
"tabs-1-btn-1",
"tabs-1-btn-2",
"team",
"testimonial-carousel-97f5369509b85b09f52be8bb505d5997",
"testimonial-carousel-2014ec8d0ae7b6943506e64ce02b8719",
"testimonials",
"testimonials-type",
"third-party-links--use-of-your-information",
Expand Down
11 changes: 8 additions & 3 deletions layouts/_partials/assets/helpers/image-dimension.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@
{{ $src = partial "assets/helpers/image-rewrite.html" (dict "src" $src "account" $account "container" $container "hook" $hook) }}
{{ end }}

{{/* Detect static assets — must be computed after any URL rewrite */}}
{{- $staticPath := strings.TrimPrefix "/static" $src -}}
{{- $isURL := or (hasPrefix $src "http://") (hasPrefix $src "https://") -}}
{{- $isStatic := and (not $isURL) (fileExists (path.Join "/static" $staticPath)) -}}

{{/* Define image dimensions */}}
{{ $dims := slice }}
{{- $res := "" -}}
Expand Down Expand Up @@ -92,7 +97,7 @@
{{ else if (and $height $width) }}
{{ $transform = "fill" }}
{{ $dims = slice (printf "%dx%d" $width $height) }}
{{ else if not $args.plain }}
{{ else if and (not $args.plain) (not $isStatic) }}
{{ $transform = "fit" }}
{{- $res := partial "utilities/GetImage.html" (dict "url" $src "page" $args.page) -}}
{{ if and $res (not (eq $res.resource nil)) }}
Expand Down Expand Up @@ -135,8 +140,8 @@
{{ end }}

{{/* Generate image url */}}
{{ if or (hasSuffix $src "svg") $args.plain }}
{{- $targetURL = partial "utilities/GetStaticURL" (dict "url" (strings.TrimPrefix "/static" $src)) -}}
{{ if or (hasSuffix $src "svg") $isStatic $args.plain }}
{{- $targetURL = partial "utilities/GetStaticURL" (dict "url" $staticPath) -}}
{{ else if (gt (len $dims) 0) }}
{{- $targetURL = partial "assets/helpers/image-set.html" (dict
"src" $src
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@gethinode/hinode",
"version": "0.0.0-semantically-released",
"description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
"description": "Hinode is a production-ready Hugo theme built on Bootstrap 5. Open source, actively maintained, and built for developers.",
"keywords": [
"hugo",
"theme",
Expand Down
Loading