Merge pull request #1695 from gethinode/templatev2

Templatev2

Author: markdumay

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

@@ -28,6 +28,7 @@ blueprint:
     class:
     anchor:
     mode:
+    width:
   order:
   width:
   justify:

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/gethinode/mod-bootstrap v1.3.5 // indirect
 	github.com/gethinode/mod-csp v1.0.8 // indirect
 	github.com/gethinode/mod-flexsearch/v3 v3.2.0 // indirect
-	github.com/gethinode/mod-fontawesome/v3 v3.0.0 // indirect
+	github.com/gethinode/mod-fontawesome/v3 v3.0.1 // indirect
 	github.com/gethinode/mod-google-analytics/v2 v2.0.0 // indirect
 	github.com/gethinode/mod-katex v1.1.4 // indirect
 	github.com/gethinode/mod-leaflet/v2 v2.0.0 // indirect

go.sum

@@ -26,6 +26,8 @@ github.com/gethinode/mod-fontawesome/v2 v2.1.3 h1:G2LyPQVhrXxBSJ/q+mBMXpNClobkQP
 github.com/gethinode/mod-fontawesome/v2 v2.1.3/go.mod h1:zukv88wXqquEvTJJ9mWWk8Ia+9INnA41wYqusf2RcHA=
 github.com/gethinode/mod-fontawesome/v3 v3.0.0 h1:mNV8ZveQ5aXEU+jmKrWaoIbq5xB2p4OYDnHSyKGDD6c=
 github.com/gethinode/mod-fontawesome/v3 v3.0.0/go.mod h1:KX8eLJCH7L27KCUCr4S5k1NOQC6O41D4G6DWOzNmeJ8=
+github.com/gethinode/mod-fontawesome/v3 v3.0.1 h1:omQww1vN879e408UyhZDazlSbVec2vbPGtUCPJfkC14=
+github.com/gethinode/mod-fontawesome/v3 v3.0.1/go.mod h1:a905KAk3fRZKh7iO11D5ocAzKr0GQcaR6v17bYTRpX8=
 github.com/gethinode/mod-google-analytics v1.3.3 h1:iX2FtXajykfHWJf7MXCQmpezqXgQUADNTeglU81QKpw=
 github.com/gethinode/mod-google-analytics v1.3.3/go.mod h1:dl628cFozpCvoIMCiV7ujzQipjxcm3eatXrSfLPWNII=
 github.com/gethinode/mod-google-analytics/v2 v2.0.0 h1:Vor4j56qtpjtKY9r5QLeN5CBxuf8YKP3+XvQKEkayrM=

layouts/_partials/assets/card.html

@@ -29,9 +29,10 @@
     {{- $color := .color -}}
     {{- $description := .description -}}
     {{- $links := .links -}}
+    {{- $class := .class }}
 
     {{- 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 {{ $class }}">
             {{ if or $title $links }}
                 <p class="card-title fs-lg-5 fs-6">
                     {{- with $title }}{{ . | page.RenderString }}{{ end }}
@@ -45,7 +46,7 @@
             {{ end -}}
         </a>
     {{- else -}}
-        <div>
+        <div{{ with $class }} class="{{ . }}"{{ end }}>
             {{ if or $title $links }}
                 <p class="card-title fs-lg-5 fs-6">
                     {{- with $title }}{{ . | page.RenderString }}{{ end }}
@@ -208,7 +209,8 @@
                 </div>
             {{- end -}}
             <div class="{{ $col2 }}">
-                <div class="card-body p-{{ $args.padding }} h-100 hstack">
+                {{ $padding := printf "p-%d%s" $args.padding (cond (and (eq $args.padding 0) (or $icon $thumbnail)) " ps-3" "") }}
+                <div class="card-body {{ $padding }} h-100 hstack">
                     {{ if $icon }}
                         {{- partial "assets/card-icon.html" (dict
                             "icon"         $icon
@@ -219,7 +221,7 @@
                         )}}
                     {{ end }}
                     <div>
-                        {{ if $page }}
+                        {{ if and $page (ne $args.headerStyle "none") }}
                             <div>{{ partial "inline/card-caption.html" (dict
                                 "page"     $page
                                 "keywords" $args.headerStyle
@@ -234,7 +236,14 @@
                             "description" $description
                             "links"       $args.links
                         ) -}}
-                        {{ if $page }}<div>{{ partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) }}</div>{{ end }}
+                        {{ if and $page (ne $args.footerStyle "none") }}
+                            <div>{{ partial "inline/card-caption.html" (dict
+                                "page"     $page
+                                "keywords" $args.footerStyle
+                                "color"    $args.color)
+                            }}
+                            </div>
+                        {{ end }}
                         {{ if and $href $args.button }}
                             {{ $label := (or $args.buttonLabel $title) | default (T "readMore") }}
                             {{ $buttonClass := "card-button mb-n4" }}
@@ -284,6 +293,7 @@
                 "color"       $args.color
                 "description" $description
                 "links"       $args.links
+                "class"       (cond (and $thumbnail (eq $args.headerStyle "none")) "pt-3" "")
             ) -}}
             {{ if $page }}{{- partial "inline/card-caption.html" (dict "page" $page "keywords" $args.footerStyle "color" $args.color) -}}{{ end }}
         </div>

layouts/_partials/assets/featured-illustration.html

@@ -41,7 +41,7 @@
             ) -}}
         {{- end -}}
     {{- else }}
-        {{ partial "assets/icon.html" (dict "icon" $icon "wrapper" $wrapper) -}}
+        {{ partial "assets/icon.html" (dict "icon" $icon "wrapper" $class "spacing" false) -}}
     {{- end -}}
 {{- else if $image -}}
     {{- if not (hasSuffix $image "svg") }}{{ $class = strings.TrimSpace (printf "%s rounded" (or $class "")) }}{{ end -}}