Compare commits

...

9 Commits

Author SHA1 Message Date
Mark Dumay
ce79ef402e Merge pull request #842 from gethinode/develop
Update release references
2024-03-17 13:09:42 +01:00
Mark Dumay
d63c838799 Merge branch 'main' into develop 2024-03-17 12:56:29 +01:00
Mark Dumay
e209704acf Update release references 2024-03-17 12:55:54 +01:00
Mark Dumay
01d19609c4 Merge pull request #841 from gethinode/develop
Support custom button label on cards
2024-03-17 12:54:47 +01:00
Mark Dumay
ee3bdfc9a0 Merge branch 'main' into develop 2024-03-17 12:49:08 +01:00
Mark Dumay
a0db71d3ff Support custom button label on cards 2024-03-17 12:47:13 +01:00
Mark Dumay
fc40ee55c3 Merge pull request #840 from gethinode/develop
Revert card body handling to HTML
2024-03-17 07:32:48 +01:00
Mark Dumay
2f61fcabf2 Merge branch 'main' into develop 2024-03-17 07:27:18 +01:00
Mark Dumay
9d30a98ff3 Revert card body handling to HTML 2024-03-17 07:26:56 +01:00
6 changed files with 25 additions and 12 deletions

View File

@@ -162,7 +162,7 @@ arguments:
parent: cascade parent: cascade
optional: true optional: true
default: start default: start
release: v0.23.0-alpha2 release: v0.23.0
comment: Icon alignment. comment: Icon alignment.
options: options:
values: values:
@@ -173,7 +173,7 @@ arguments:
type: string type: string
parent: cascade parent: cascade
optional: true optional: true
release: v0.23.0-alpha2 release: v0.23.0
comment: Icon style. comment: Icon style.
orientation: orientation:
type: select type: select
@@ -191,15 +191,21 @@ arguments:
type: bool type: bool
parent: cascade parent: cascade
optional: true optional: true
release: v0.23.0-alpha2 release: v0.23.0
comment: Apply subtle background colors. comment: Apply subtle background colors.
button: button:
type: bool type: bool
parent: cascade parent: cascade
optional: true optional: true
release: v0.23.0-beta release: v0.23.0
comment: >- comment: >-
Flag indicating the cards should include a button that links to the provided address. Flag indicating the cards should include a button that links to the provided address.
buttonLabel:
type: string
optional: true
release: v0.23.2
comment: >-
Label of the link button, defaults to the card title.
hook: hook:
type: string type: string
optional: true optional: true

View File

@@ -119,4 +119,4 @@ arguments:
type: string type: string
optional: true optional: true
comment: Class attribute of the figure caption, e.g. `px-4`. comment: Class attribute of the figure caption, e.g. `px-4`.
release: v0.23.0-beta release: v0.23.0

View File

@@ -32,6 +32,7 @@
{{- $subtle := .subtle }} {{- $subtle := .subtle }}
{{- $loading := .loading -}} {{- $loading := .loading -}}
{{- $button := .button -}} {{- $button := .button -}}
{{- $buttonLabel := .buttonLabel -}}
{{- $hook := .hook | default "assets/card.html" }} {{- $hook := .hook | default "assets/card.html" }}
<!-- Override arguments --> <!-- Override arguments -->
@@ -104,6 +105,7 @@
"style" $style "style" $style
"align" $align "align" $align
"button" $button "button" $button
"buttonLabel" $buttonLabel
) -}} ) -}}
{{- $params = merge $params $element }} {{- $params = merge $params $element }}

View File

@@ -30,6 +30,7 @@
{{- $title := .title -}} {{- $title := .title -}}
{{- $subtle := .subtle -}} {{- $subtle := .subtle -}}
{{- $button := .button -}} {{- $button := .button -}}
{{- $buttonLabel := .buttonLabel -}}
{{- $colorStyle := "" -}} {{- $colorStyle := "" -}}
{{ if $color }} {{ if $color }}
{{ if $subtle }} {{ if $subtle }}
@@ -76,12 +77,16 @@
{{- if $href -}} {{- if $href -}}
<a href="{{ $href }}" class="{{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }} stretched-link"> <a href="{{ $href }}" class="{{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }} stretched-link">
<p class="card-title fs-5 fw-bold">{{ $title }}</p> <p class="card-title fs-5 fw-bold">{{ $title }}</p>
{{ with $description }}<div class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">{{ . | page.RenderString | safeHTML }}</div>{{ end -}} {{ with $description }}
<div class="card-text {{ if $color }}link-bg-{{ $color }}{{ else }}card-body-link{{ end }}">
{{ . | safeHTML }}
</div>
{{ end -}}
</a> </a>
{{- else -}} {{- else -}}
<div> <div>
{{ with $title }}<p class="card-title fs-5 fw-bold">{{ . }}</p>{{ end -}} {{ with $title }}<p class="card-title fs-5 fw-bold">{{ . }}</p>{{ end -}}
{{ with $description }}<div class="card-text">{{ . | page.RenderString | safeHTML }}</div>{{ end -}} {{ with $description }}<div class="card-text">{{ . | safeHTML }}</div>{{ end -}}
</div> </div>
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@@ -141,7 +146,7 @@
</div> </div>
{{ if $page }}<div>{{ partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) }}</div>{{ end }} {{ if $page }}<div>{{ partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) }}</div>{{ end }}
{{ if $button }} {{ if $button }}
{{ $label := $title | default (T "readMore") }} {{ $label := (or $buttonLabel $title) | default (T "readMore") }}
<div>{{ partial "assets/button.html" (dict "title" $label "icon" "fas chevron-right" "href" $href "outline" true "size" "sm" "class" "card-button mb-n4") }}</div> <div>{{ partial "assets/button.html" (dict "title" $label "icon" "fas chevron-right" "href" $href "outline" true "size" "sm" "class" "card-button mb-n4") }}</div>
{{ end }} {{ end }}
</div> </div>
@@ -164,7 +169,7 @@
{{ if $page }}{{- partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) -}}{{ end }} {{ if $page }}{{- partial "card-caption.html" (dict "page" $page "keywords" $footer "color" $color) -}}{{ end }}
</div> </div>
{{ if $button }} {{ if $button }}
{{ $label := $title | default (T "readMore") }} {{ $label := (or $buttonLabel $title) | default (T "readMore") }}
<div class="row p-{{ $padding }}" > <div class="row p-{{ $padding }}" >
<div class="{{ if eq $orientation "horizontal-sm" }}col-4 col-md-2{{ else if eq $orientation "horizontal" }}col-4{{ end }}"></div> <div class="{{ if eq $orientation "horizontal-sm" }}col-4 col-md-2{{ else if eq $orientation "horizontal" }}col-4{{ end }}"></div>
<div class="col {{ if eq $orientation "horizontal-sm" }}px-2{{ else if eq $orientation "horizontal"}}px-1 {{ else }}px-2 pt-1{{ end }}"> <div class="col {{ if eq $orientation "horizontal-sm" }}px-2{{ else if eq $orientation "horizontal"}}px-1 {{ else }}px-2 pt-1{{ end }}">

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "@gethinode/hinode", "name": "@gethinode/hinode",
"version": "0.23.0", "version": "0.23.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@gethinode/hinode", "name": "@gethinode/hinode",
"version": "0.23.0", "version": "0.23.2",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@fullhuman/postcss-purgecss": "^5.0.0", "@fullhuman/postcss-purgecss": "^5.0.0",

View File

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