Skip to content

Commit f00a38c

Browse files
authored
Merge pull request #1589 from gethinode/develop
Develop
2 parents b3618c2 + 510cb7f commit f00a38c

File tree

7 files changed

+37
-27
lines changed

7 files changed

+37
-27
lines changed

.github/codeql/codeql-config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ paths-ignore:
44
- '**/vendor'
55
- '**/critical/languageSelector.js'
66
- '**/critical/color.js'
7+
- '**/clipboard.js'
78
- '**/navbar.js'
89
- '**/sharing.js'

component-library/components/articles/articles.bookshop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ blueprint:
4444
bento:
4545
cover:
4646
header-style:
47+
body-style:
4748
footer-style:
4849
orientation:
4950
class:

component-library/components/articles/articles.hugo.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,11 @@
8282
{{- $params = merge $params (dict
8383
"page" page
8484
"list" $pages
85-
"limit" $args.limit
8685
"cols" $args.cols
87-
"icon-rounded" $args.iconRounded
88-
"icon-style" $args.iconStyle
86+
"limit" $args.limit
87+
"padding" $args.padding
8988
"href" (cond $moreButton $moreLink "")
90-
"href-title" (cond $moreButton $moreTitle "")
9189
"href-force" (gt $result.total (len $result.pages))
92-
"more-link-type" $moreType
93-
"more-link-icon" $moreIcon
9490
)}}
9591

9692
{{ if $args.scroll }}
@@ -100,22 +96,26 @@
10096
"body-style" "title"
10197
"footer-style" "none"
10298
"gutter" 1
103-
"padding" 3
10499
"ratio" "1x1"
105100
"orientation" "horizontal-sm"
106101
"styles" (cond $args.bento $styles "")
107102
) -}}
108103
{{ else }}
109104
{{ $params = merge $params (dict
110-
"header-style" $args.headerStyle
111-
"footer-style" $args.footerStyle
112-
"padding" $args.padding
113-
"class" (or $args.class "border-0")
114-
"align" "start"
115-
"orientation" $args.orientation
116-
"hook" "assets/live-card.html"
117-
"pagination" $args.pagination
118-
"paginate" $paginate
105+
"header-style" $args.headerStyle
106+
"body-style" $args.bodyStyle
107+
"footer-style" $args.footerStyle
108+
"class" (or $args.class "border-0")
109+
"align" "start"
110+
"orientation" $args.orientation
111+
"href-title" (cond $moreButton $moreTitle "")
112+
"icon-rounded" $args.iconRounded
113+
"icon-style" $args.iconStyle
114+
"hook" "assets/live-card.html"
115+
"more-link-type" $moreType
116+
"more-link-icon" $moreIcon
117+
"pagination" $args.pagination
118+
"paginate" $paginate
119119
) -}}
120120
{{ end }}
121121
{{ if gt (len $pages) 0 }}

data/structures/stack.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ arguments:
2929
optional: true
3030
comment: Array of pages or structured content to be rendered as cards.
3131
group: partial
32+
limit:
3233
max:
3334
type: int
3435
optional: true
35-
comment: Maximum number of cards to display.
36+
comment: Maximum number of elements to display.
3637
group: partial
3738
options:
3839
min: 1
40+
deprecated: v1.16.2
41+
alternative: limit
3942
cols:
4043
type: select
4144
optional: true
@@ -57,6 +60,9 @@ arguments:
5760
Address for the button or hyperlink. If set, a button is added if the
5861
list exceeds the maximum number of cards to display.
5962
group: partial
63+
href-force:
64+
release: v1.16.2
65+
group: partial
6066
hrefTitle:
6167
type: string
6268
optional: true
@@ -87,4 +93,5 @@ arguments:
8793
comment: >-
8894
Styles to apply to the individual cards. Supported elements are `ratio`,
8995
`orientation`, `portrait`, and `width`.
90-
96+
padding:
97+
release: v1.16.2

layouts/_partials/assets/card.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
{{ end }}
181181

182182
{{- if eq $args.orientation "none" }}{{ $thumbnail = "" }}{{ $icon = "" }}{{ end -}}
183-
{{- if eq $args.body "title" }}{{ $description = "" }}{{ end -}}
184-
{{- if eq $args.body "none" }}{{ $title = "" }}{{ $description = "" }}{{ end -}}
183+
{{- if or (eq $args.bodyStyle "title") (eq $args.body "title") }}{{ $description = "" }}{{ end -}}
184+
{{- if or (eq $args.bodyStyle "none") (eq $args.body "none") }}{{ $title = "" }}{{ $description = "" }}{{ end -}}
185185
{{ if site.Params.main.titleCase }}{{ $title = title $title }}{{ end }}
186186

187187
{{- $thumbnailArgs := dict

layouts/_partials/assets/links.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@
9999
</div>
100100

101101
<div class="d-{{ $breakpoint.current }}-none pt-{{ $padding.y }}">
102-
{{ partial "links-content.html" (dict "links" $args.links "justify" $args.justify "type" $args.linkType "li" true) }}
102+
{{ partial "links-content.html" (dict "links" $args.links "justify" $args.justify "type" $args.linkType "li" false) }}
103103
</div>

layouts/_partials/assets/stack.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,27 @@
2424
{{ $params := dict
2525
"page" $args.page
2626
"list" $args.list
27-
"max" $args.max
27+
"limit" (or $args.limit $args.max)
2828
"class" "border-0 card-zoom"
2929
"header-style" "none"
3030
"body-style" "title"
3131
"footer-style" "none"
32-
"href" $args.href
33-
"href-title" $args.hrefTitle
34-
"link-type" (or $args.linkType $args.buttonType)
32+
"href" $args.href
33+
"href-force" $args.hrefForce
34+
"href-title" $args.hrefTitle
35+
"link-type" (or $args.linkType $args.buttonType)
3536
}}
3637

3738
{{- partial "assets/card-group.html" (merge $params
3839
(dict
3940
"cols" $args.cols
4041
"gutter" $args.gutter
41-
"padding" 3
42+
"padding" $args.padding
4243
"orientation" "stacked"
4344
"scroll" true
4445
"bento" true
4546
"spacer" $args.animated
46-
"portrait" true
47+
"portrait" false
4748
"valign" (cond $args.animated "" "end")
4849
"styles" $args.styles
4950
"wrapper" "card-stack p-0 my-3 d-none d-md-block"

0 commit comments

Comments
 (0)