Skip to content

Commit a44b544

Browse files
markdumaymarkdumay
authored
Merge pull request #1472 from gethinode/develop
Fix handling of card parent arguments
2 parents 77aa394 + 461f53c commit a44b544

File tree

10 files changed

+117
-119
lines changed

10 files changed

+117
-119
lines changed

‎exampleSite/hugo_stats.json‎

Lines changed: 82 additions & 92 deletions
Large diffs are not rendered by default.

‎layouts/_partials/assets/card.html‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,22 @@
203203
{{- end -}}
204204
<div class="{{ $col2 }}">
205205
<div class="card-body d-flex p-{{ $args.padding }} flex-column h-100 flex-fill">
206-
{{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.headerStyle "color" $args.color) }}</div>{{ end }}
206+
{{ if $page }}
207+
<div>{{ partial "inline/card-caption.html" (dict
208+
"page" $page
209+
"keywords" $args.headerStyle
210+
"color" $args.color
211+
) }}
212+
</div>
213+
{{ end }}
207214
<div class="flex-fill">
208-
{{- partial "inline/card-body.html" (dict "title" $title "href" $href "color" $args.color "description" $description "button" $args.button) -}}
215+
{{- partial "inline/card-body.html" (dict
216+
"title" $title
217+
"href" $href
218+
"color" $args.color
219+
"description" $description
220+
"button" $args.button
221+
) -}}
209222
</div>
210223
{{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) }}</div>{{ end }}
211224
{{ if and $href $args.button }}

layouts/_partials/body/panel-toc.html renamed to layouts/_partials/page/panel-toc.html

File renamed without changes.

layouts/_partials/body/sidebar.html renamed to layouts/_partials/page/sidebar.html

File renamed without changes.

layouts/_partials/single/thumbnail.html renamed to layouts/_partials/page/thumbnail.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
{{ end }}
3434
{{ else }}
3535
{{- $thumbnail = $page.Params.Thumbnail -}}
36-
{{ if or $page.Params.photoCredits $page.Params.photoSource }}
37-
{{ warnf "DEPRECATED: frontmatter variables `photoCredits` and `photoSource` have been deprecated in release v0.18: %s" $page.RelPermalink }}
38-
{{ end }}
39-
{{- if and $page.Params.photoCredits $page.Params.PhotoSource }}{{ $credits = printf (T "photoFull") $page.Params.photoCredits $page.Params.PhotoSource }}{{ end -}}
4036
{{- end -}}
4137

4238
{{ if $thumbnail -}}

‎layouts/_shortcodes/card.html‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@
2626
{{- $class := partial "utilities/GetArgParent" (dict "page" . "arg" "class" "merge" true) -}}
2727
{{- $color := partial "utilities/GetArgParent" (dict "page" . "arg" "color") -}}
2828
{{- $description := trim .Inner " \r\n" | .Page.RenderString | safeHTML -}}
29-
{{- $footer := partial "utilities/GetArgParent" (dict "page" . "arg" "footer-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "footer") | default "none" -}}
30-
{{- $gutter := partial "utilities/GetArgParent" (dict "page" . "arg" "gutter") | default "0" -}}
31-
{{- $header := partial "utilities/GetArgParent" (dict "page" . "arg" "header-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "header") | default "full" -}}
29+
{{- $footer := or (partial "utilities/GetArgParent" (dict "page" . "arg" "footer-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "footer")) -}}
30+
{{- $gutter := partial "utilities/GetArgParent" (dict "page" . "arg" "gutter") -}}
31+
{{- $header := or (partial "utilities/GetArgParent" (dict "page" . "arg" "header-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "header")) -}}
3232
{{- $icon := .Get "icon" -}}
33-
{{- $iconRounded := partial "utilities/GetArgParent" (dict "page" . "arg" "icon-rounded") | partial "utilities/GetArgParent" (dict "page" . "arg" "iconRounded") | default false -}}
34-
{{- $align := partial "utilities/GetArgParent" (dict "page" . "arg" "align") | default "start" -}}
35-
{{- $style := partial "utilities/GetArgParent" (dict "page" . "arg" "icon-style") | partial "utilities/GetArgParent" (dict "page" . "arg" "style") | default "" -}}
36-
{{- $subtle := partial "utilities/GetArgParent" (dict "page" . "arg" "subtle") | default false -}}
33+
{{- $iconRounded := or (partial "utilities/GetArgParent" (dict "page" . "arg" "icon-rounded")) (partial "utilities/GetArgParent" (dict "page" . "arg" "iconRounded")) -}}
34+
{{- $align := partial "utilities/GetArgParent" (dict "page" . "arg" "align") -}}
35+
{{- $style := or (partial "utilities/GetArgParent" (dict "page" . "arg" "icon-style")) (partial "utilities/GetArgParent" (dict "page" . "arg" "style")) -}}
36+
{{- $subtle := partial "utilities/GetArgParent" (dict "page" . "arg" "subtle") -}}
3737
{{- $loading := .Get "loading" -}}
38-
{{- $orientation := partial "utilities/GetArgParent" (dict "page" . "arg" "orientation") | default "stacked" -}}
39-
{{- $padding := partial "utilities/GetArgParent" (dict "page" . "arg" "padding") | default 3 -}}
40-
{{- $ratio := partial "utilities/GetArgParent" (dict "page" . "arg" "ratio") | default "" -}}
38+
{{- $orientation := partial "utilities/GetArgParent" (dict "page" . "arg" "orientation") -}}
39+
{{- $padding := partial "utilities/GetArgParent" (dict "page" . "arg" "padding") -}}
40+
{{- $ratio := partial "utilities/GetArgParent" (dict "page" . "arg" "ratio") -}}
4141
{{- $page := .Page -}}
4242
{{- $path := .Get "path" -}}
4343
{{- $thumbnail := .Get "thumbnail" -}}
4444
{{- $anchor := .Get "anchor" -}}
4545
{{- $title := .Get "title" -}}
46-
{{- $button := partial "utilities/GetArgParent" (dict "page" . "arg" "button") | default false -}}
47-
{{- $linkType := partial "utilities/GetArgParent" (dict "page" . "arg" "link-type") | partial "utilities/GetArgParent" (dict "page" . "arg" "buttonType") | default "" -}}
48-
{{- $cols := partial "utilities/GetArgParent" (dict "page" . "arg" "cols") | default 3 -}}
49-
{{- $scroll := partial "utilities/GetArgParent" (dict "page" . "arg" "scroll") | default false -}}
46+
{{- $button := partial "utilities/GetArgParent" (dict "page" . "arg" "button") -}}
47+
{{- $linkType := or (partial "utilities/GetArgParent" (dict "page" . "arg" "link-type")) (partial "utilities/GetArgParent" (dict "page" . "arg" "buttonType")) -}}
48+
{{- $cols := partial "utilities/GetArgParent" (dict "page" . "arg" "cols") -}}
49+
{{- $scroll := partial "utilities/GetArgParent" (dict "page" . "arg" "scroll") -}}
5050
{{- $wrapper := "" -}}
5151

5252
{{/* Override arguments */}}
@@ -66,7 +66,6 @@
6666
{{ $wrapper = printf "card-block-%d p-0" $cols }}
6767
{{ end }}
6868

69-
7069
{{/* Main code */}}
7170
{{ if not $error -}}
7271
{{/* Render card */}}

‎layouts/body.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
{{- partial "single/thumbnail.html" (dict "page" . "wrapper" "mb-5") -}}
1+
{{- partial "page/thumbnail.html" (dict "page" . "wrapper" "mb-5") -}}
22

33
{{ partial "utilities/ProcessContent" (dict "page" .Page "raw" .RawContent) }}

‎layouts/single.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{ define "main" -}}
22
{{- $breakpoint := $.Scratch.Get "breakpoint" -}}
3-
{{- $sidebar := partial "body/sidebar" . -}}
4-
{{- $toc := partial "body/panel-toc" . -}}
3+
{{- $sidebar := partial "page/sidebar" . -}}
4+
{{- $toc := partial "page/panel-toc" . -}}
55

66
{{ with $sidebar }}
77
<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvass-sidebar" aria-labelledby="offcanvas-label">

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gethinode/hinode",
3-
"version": "1.0.0-beta2",
3+
"version": "1.0.0-beta3",
44
"description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
55
"keywords": [
66
"hugo",

0 commit comments

Comments
 (0)