From 154807e16bfd58dd1e53371111bb99cb89fa6d33 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Fri, 29 Oct 2021 18:47:16 +0000
Subject: [PATCH] ISTWCMS-4868: updated banner to correct inconsistencies with
overlayed caption text
---
.../card/card--banner/_card--banner.scss | 11 ++++++++---
.../card/card--banner/card--banner.twig | 1 -
source/_patterns/04-components/card/card.twig | 15 +++++++++++++--
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/source/_patterns/04-components/card/card--banner/_card--banner.scss b/source/_patterns/04-components/card/card--banner/_card--banner.scss
index 6927ef62..09c6d985 100644
--- a/source/_patterns/04-components/card/card--banner/_card--banner.scss
+++ b/source/_patterns/04-components/card/card--banner/_card--banner.scss
@@ -64,12 +64,17 @@ $faculties: 'org-default', 'org-ahs', 'org-art', 'org-eng', 'org-env', 'org-mat'
text-align: center;
width: 100%;
z-index: gesso-z-index(overlay);
- h2 {
- margin: 0;
+ .card__title {
+ font-family: $header-font-family;
+ font-size: gesso-font-size(6);
+ line-height: 1.25;
+ margin:0;
}
.sub-title {
- font-family: $header-font-family;
+ font-family:gesso-font-family(book);
+ font-size: gesso-font-size(0);
+ line-height:1;
}
}
diff --git a/source/_patterns/04-components/card/card--banner/card--banner.twig b/source/_patterns/04-components/card/card--banner/card--banner.twig
index 21d9f6ca..2ccb9754 100644
--- a/source/_patterns/04-components/card/card--banner/card--banner.twig
+++ b/source/_patterns/04-components/card/card--banner/card--banner.twig
@@ -6,7 +6,6 @@
card_type: 'banner',
title: image.big_text,
sub_title: image.small_text,
- header_level: 2,
url: image.link,
} %}
{% endfor %}
diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig
index f6b4f3db..8bca1dbf 100644
--- a/source/_patterns/04-components/card/card.twig
+++ b/source/_patterns/04-components/card/card.twig
@@ -27,7 +27,12 @@
{% endif %}
{% if show_title == 'yes' %}
- <h{{ header_level }} class="card__title">
+ {% if header_level %}
+ <h{{ header_level }} class="card__title">
+ {% else %}
+ <div class="card__title">
+ <strong>
+ {% endif %}
{% if url %}
<a href="{{ url }}">
{% endif %}
@@ -35,7 +40,13 @@
{% if url %}
</a>
{% endif %}
- </h{{ header_level }}>
+ </strong>
+ {% if header_level %}
+ </h{{ header_level }}>
+ {% else %}
+ </div>
+ {% endif%}
+
{% if sub_title %}
<span class="sub-title">{{ sub_title }}</span>
{% endif %}
--
GitLab