From 0a60bd40ccbd9aba347a9ce181a750a53688931a Mon Sep 17 00:00:00 2001
From: Patrice Chalin <pchalin@gmail.com>
Date: Wed, 8 Mar 2023 07:20:22 -0500
Subject: [PATCH] [BSv5] blocks/cover row/col fix

---
 assets/scss/blocks/_cover.scss                |  1 +
 layouts/shortcodes/blocks/cover.html          | 74 +++++++++----------
 userguide/content/en/_index.html              |  2 +-
 .../en/docs/adding-content/iconsimages.md     |  2 +-
 4 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/assets/scss/blocks/_cover.scss b/assets/scss/blocks/_cover.scss
index 703ef43e2b..38709fbf6a 100644
--- a/assets/scss/blocks/_cover.scss
+++ b/assets/scss/blocks/_cover.scss
@@ -17,6 +17,7 @@
   }
 
   & > .byline {
+    @extend .small;
     position: absolute;
     bottom: 2px;
     right: 4px;
diff --git a/layouts/shortcodes/blocks/cover.html b/layouts/shortcodes/blocks/cover.html
index 48e3192372..c3e357f058 100644
--- a/layouts/shortcodes/blocks/cover.html
+++ b/layouts/shortcodes/blocks/cover.html
@@ -1,50 +1,50 @@
-{{ $_hugo_config := `{ "version": 1 }` }}
-{{ $blockID := printf "td-cover-block-%d" .Ordinal }}
-{{ $promo_image := (.Page.Resources.ByType "image").GetMatch "**background*" }}
-{{ $logo_image := (.Page.Resources.ByType "image").GetMatch "**logo*" }}
-{{ $col_id := .Get "color" | default "dark" }}
-{{ $image_anchor := .Get "image_anchor" | default "smart" }}
-{{ $logo_anchor := .Get "logo_anchor" | default "smart" }}
-{{/* Height can be one of: auto, min, med, max, full. */}}
-{{ $height := .Get "height" | default "max" }}
-{{ $byline := .Get "byline" | default "" }}
-{{ with $promo_image }}
-{{ $promo_image_big := (.Fill (printf "1920x1080 %s" $image_anchor)) }}
-{{ $promo_image_small := (.Fill (printf "960x540 %s" $image_anchor)) }}
+{{ $_hugo_config := `{ "version": 1 }` -}}
+{{ $blockID := printf "td-cover-block-%d" .Ordinal -}}
+{{ $promo_image := (.Page.Resources.ByType "image").GetMatch "**background*" -}}
+{{ $logo_image := (.Page.Resources.ByType "image").GetMatch "**logo*" -}}
+{{ $col_id := .Get "color" | default "dark" -}}
+{{ $image_anchor := .Get "image_anchor" | default "smart" -}}
+{{ $logo_anchor := .Get "logo_anchor" | default "smart" -}}
+{{/* Height can be one of: auto, min, med, max, full. */ -}}
+{{ $height := .Get "height" | default "max" -}}
+
+{{ with $promo_image -}}
+{{ $promo_image_big := (.Fill (printf "1920x1080 %s" $image_anchor)) -}}
+{{ $promo_image_small := (.Fill (printf "960x540 %s" $image_anchor)) -}}
 <link rel="preload" as="image" href="{{ $promo_image_small.RelPermalink }}" media="(max-width: 1200px)">
 <link rel="preload" as="image" href="{{ $promo_image_big.RelPermalink }}" media="(min-width: 1200px)">
 <style>
 #{{ $blockID }} {
-    background-image: url({{ $promo_image_small.RelPermalink }}); 
+  background-image: url({{ $promo_image_small.RelPermalink }});
 }
 @media only screen and (min-width: 1200px) {
-    #{{ $blockID }} {
-        background-image: url({{ $promo_image_big.RelPermalink }}); 
-    }
+  #{{ $blockID }} {
+    background-image: url({{ $promo_image_big.RelPermalink }});
+  }
 }
 </style>
-{{ end }}
-<section id="{{ $blockID }}" class="row td-cover-block td-cover-block--height-{{ $height }}{{ if not .Site.Params.ui.navbar_translucent_over_cover_disable }} js-td-cover{{ end }} td-overlay td-overlay--dark -bg-{{ $col_id }}">
-  <div class="container td-overlay__inner">
-    <div class="row">
-      <div class="col-12">
-        <div class="text-center">
-          {{ with .Get "title" }}<h1 class="display-1 mt-0 mt-md-5 pb-4">{{ $title := . }}{{ with $logo_image }}{{ $logo_image_resized := (.Fit (printf "70x70 %s" $logo_anchor)) }}<img class="td-cover-logo" src="{{ $logo_image_resized.RelPermalink }}" alt="{{ $title | html }} Logo">{{ end }}{{ $title | html }}</h1>{{ end }}
-          {{ with .Get "subtitle" }}<p class="display-2 text-uppercase mb-0">{{ . | html }}</p>{{ end }}
-          <div class="pt-3 lead">
-            {{ if eq .Page.File.Ext "md" }}
-                {{ .Inner | markdownify }}
-            {{ else }}
-                {{ .Inner | htmlUnescape | safeHTML }}
-            {{ end }}
-          </div>
+{{ end -}}
+
+<section id="{{ $blockID }}" class="row td-cover-block td-cover-block--height-{{ $height -}}
+  {{ if not .Site.Params.ui.navbar_translucent_over_cover_disable }} js-td-cover
+  {{- end }} td-overlay td-overlay--dark -bg-{{ $col_id }}">
+  <div class="col-12 p-0">
+    <div class="container td-overlay__inner">
+      <div class="text-center">
+        {{ with .Get "title" }}<h1 class="display-1 mt-0 mt-md-5 pb-4">{{ $title := . }}{{ with $logo_image }}{{ $logo_image_resized := (.Fit (printf "70x70 %s" $logo_anchor)) }}<img class="td-cover-logo" src="{{ $logo_image_resized.RelPermalink }}" alt="{{ $title | html }} Logo">{{ end }}{{ $title | html }}</h1>{{ end }}
+        {{ with .Get "subtitle" }}<p class="display-2 text-uppercase mb-0">{{ . | html }}</p>{{ end }}
+        <div class="pt-3 lead">
+          {{ if eq .Page.File.Ext "md" }}
+              {{ .Inner | markdownify }}
+          {{ else }}
+              {{ .Inner | htmlUnescape | safeHTML }}
+          {{ end }}
         </div>
       </div>
     </div>
   </div>
-  {{ if $byline }}
-  <div class="byline">
-    <small>{{ $byline }}</small>
-  </div>
-  {{ end }}
+  {{ with .Get "byline" | default "" -}}
+    <div class="byline">{{ . }}</div>
+  {{- end }}
 </section>
+{{/**/ -}}
diff --git a/userguide/content/en/_index.html b/userguide/content/en/_index.html
index 835f233176..163ac94af6 100644
--- a/userguide/content/en/_index.html
+++ b/userguide/content/en/_index.html
@@ -2,7 +2,7 @@
 title: Docsy
 ---
 
-{{< blocks/cover title="Welcome to Docsy!" image_anchor="top" height="full" color="orange" >}}
+{{< blocks/cover title="Welcome to Docsy!" image_anchor="top" height="full" >}}
 <div class="mx-auto">
 	<a class="btn btn-lg btn-primary me-3 mb-4" href="{{< relref "/about" >}}">
 		Learn More <i class="fa-solid fa-circle-right ms-2"></i>
diff --git a/userguide/content/en/docs/adding-content/iconsimages.md b/userguide/content/en/docs/adding-content/iconsimages.md
index b14200bc87..94fc43b7da 100644
--- a/userguide/content/en/docs/adding-content/iconsimages.md
+++ b/userguide/content/en/docs/adding-content/iconsimages.md
@@ -57,7 +57,7 @@ Docsy's [`blocks/cover` shortcode](/docs/adding-content/shortcodes/#blockscover)
 You specify the preferred display height of a cover block container (and hence its image) using the block's `height` parameter.  For a full viewport height, use `full`:
 
 ```html
-{{</* blocks/cover title="Welcome to the Docsy Example Project!" image_anchor="top" height="full" color="orange" */>}}
+{{</* blocks/cover title="Welcome to the Docsy Example Project!" image_anchor="top" height="full" */>}}
 ...
 {{</* /blocks/cover */>}}
 ```