Merge pull request #1502 from gethinode/develop

Develop

Author: markdumay

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

@@ -24,7 +24,8 @@
 	{{ $class := "" }}
 	{{ $id := printf "faq-%s" (md5 (delimit (slice . now) "-")) }}
 
-	<div id="{{ $id }}" class="accordion accordion-faq {{ if $args.contrast }}accordion-faq-contrast text-white {{ end }}accordion-flush mb-3{{ with $class }} {{ . }}{{ end }} col-12 col-md-6 mx-auto">
+	<div id="{{ $id }}" class="accordion accordion-faq {{ if $args.contrast }}accordion-faq-contrast text-white {{ end -}}
+		accordion-flush{{ with $class }} {{ . }}{{ end }} col-12 col-md-6 mx-auto">
 		{{ range $index, $item := $args.items }}
 			<div class="accordion-item">
 				{{- with $item.title -}}

component-library/components/video-message/video-message.bookshop.yml

@@ -24,6 +24,7 @@ blueprint:
   link-type:
   orientation:
   icon-rounded:
+  icon-style:
   video:
     provider:
     account:

component-library/components/video-message/video-message.hugo.html

@@ -59,6 +59,7 @@
 	{{ $cols := .cols }}
 	{{ $type := .type }}
 	{{ $iconRounded := .iconRounded }}
+	{{ $iconStyle := .iconStyle }}
 
 	{{- partial "assets/card-group.html" (dict 
 		"page"         page
@@ -75,6 +76,7 @@
 		"button"       true
 		"link-type"    $type
 		"icon-rounded" $iconRounded
+		"icon-style"   $iconStyle
 	) -}}
 {{ end }}
 
@@ -99,7 +101,7 @@
 	{{- partial "assets/section-title.html" (dict "heading" $args.heading "justify" $args.justify) -}}
 
 	{{ if eq $args.orientation "stacked" }}
-		<div class="col-{{ $breakpoint.current }}-{{ $args.width }} mx-auto pb-{{ $padding.y }}">
+		<div class="col-{{ $breakpoint.current }}-{{ $args.width }} mx-auto">
 		{{ with $args.video }}
 			{{- partial "inline/video.html" (dict
 				"provider"   .provider
@@ -112,11 +114,17 @@
 			) -}}
 		{{ end }}
 		</div>
-		<div class="mt-{{ $padding.y }} pb-{{ $padding.y }}">
-			{{- partial "inline/messages.html" (dict "list" $list "cols" $args.cols "type" $args.type "iconRounded" $args.iconRounded) -}}
+		<div class="mt-{{ $padding.y }}">
+			{{- partial "inline/messages.html" (dict
+				"list"        $list
+				"cols"        $args.cols
+				"type"        $args.type
+				"iconRounded" $args.iconRounded
+				"iconStyle"   $args.iconStyle
+			) -}}
 		</div>
 	{{ else }}
-		<div class="container grid gap-4 pb-{{ $padding.y }}">
+		<div class="container grid gap-{{ $padding.x }}">
 			<div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2">
 				<div class="col col-{{ $breakpoint.current }}-{{ $args.width }} p-0">
 					{{ with $args.video }}
@@ -132,7 +140,13 @@
 					{{ end }}
 				</div>
 				<div class="col col-{{ $breakpoint.current }}-{{ sub 12 $args.width }} mt-{{ $padding.y }} mt-{{ $breakpoint.current }}-0">
-					{{- partial "inline/messages.html" (dict "list" $list "cols" 1 "type" $args.type "iconRounded" $args.iconRounded) -}}
+					{{- partial "inline/messages.html" (dict
+						"list"        $list
+						"cols"        1
+						"type"        $args.type
+						"iconRounded" $args.iconRounded
+						"iconStyle"   $args.iconStyle
+					) -}}
 				</div>
 			</div>
 		</div>

exampleSite/content/en/blocks/video-message.md

@@ -24,6 +24,7 @@ The `video` content block renders a horizontal line to separate sections. The se
     color: primary
     subtle: true
   orientation: horizontal
+  icon-style: fa-lg
   video:
     provider: vimeo
     media-id: "55073825"