From b3dbc1858b1cc341abbbd4d82579c7bc50c37ec1 Mon Sep 17 00:00:00 2001 From: Eric Bremner <ebremner@uwaterloo.ca> Date: Tue, 9 Nov 2021 18:24:05 +0000 Subject: [PATCH] ISTWCMS-5195: renaming component for easier reability --- .../_additional-info.twig | 0 .../_location-info.twig | 0 .../{card-footer-elements => card-elements}/_tags.twig | 0 source/_patterns/04-components/card/card.twig | 7 ++++--- 4 files changed, 4 insertions(+), 3 deletions(-) rename source/_patterns/04-components/card/{card-footer-elements => card-elements}/_additional-info.twig (100%) rename source/_patterns/04-components/card/{card-footer-elements => card-elements}/_location-info.twig (100%) rename source/_patterns/04-components/card/{card-footer-elements => card-elements}/_tags.twig (100%) diff --git a/source/_patterns/04-components/card/card-footer-elements/_additional-info.twig b/source/_patterns/04-components/card/card-elements/_additional-info.twig similarity index 100% rename from source/_patterns/04-components/card/card-footer-elements/_additional-info.twig rename to source/_patterns/04-components/card/card-elements/_additional-info.twig diff --git a/source/_patterns/04-components/card/card-footer-elements/_location-info.twig b/source/_patterns/04-components/card/card-elements/_location-info.twig similarity index 100% rename from source/_patterns/04-components/card/card-footer-elements/_location-info.twig rename to source/_patterns/04-components/card/card-elements/_location-info.twig diff --git a/source/_patterns/04-components/card/card-footer-elements/_tags.twig b/source/_patterns/04-components/card/card-elements/_tags.twig similarity index 100% rename from source/_patterns/04-components/card/card-footer-elements/_tags.twig rename to source/_patterns/04-components/card/card-elements/_tags.twig diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig index 33bdc711..5b1102db 100644 --- a/source/_patterns/04-components/card/card.twig +++ b/source/_patterns/04-components/card/card.twig @@ -70,6 +70,7 @@ {% endif %} </div> {% endif %} + {% if not featured_image and (sources or img_element) %} <div class="card__media"> {% if url %} @@ -106,7 +107,7 @@ {{ footer }} {% if additional_info %} - {% include '@components/card/card-footer-elements/_additional-info.twig' with { + {% include '@components/card/card-elements/_additional-info.twig' with { 'additional_info': additional_info } %} {% endif %} @@ -141,7 +142,7 @@ {% endif %} {% if location_info %} - {% include '@components/card/card-footer-elements/_location-info.twig' with { + {% include '@components/card/card-elements/_location-info.twig' with { 'address': location_info.address, 'map': location_info.map, 'map_link': location_info.map_link, @@ -209,7 +210,7 @@ {% endif %} {% if tags %} - {% include '@components/card/card-footer-elements/_tags.twig' with { + {% include '@components/card/card-elements/_tags.twig' with { 'tags': tags, } %} {% endif %} -- GitLab