From 3f8d5d3b3cdb26007394a95580d0b239fad2ce10 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Mon, 17 Aug 2020 10:45:15 -0400
Subject: [PATCH] ISTWCMS-4027: updating the macro for tags so that it works in
Drupal
---
source/_macros/gesso.macro.twig | 11 -----------
source/_patterns/04-components/card/card.twig | 2 +-
source/_patterns/04-components/tag/_tag_macro.twig | 9 +++++++++
3 files changed, 10 insertions(+), 12 deletions(-)
create mode 100644 source/_patterns/04-components/tag/_tag_macro.twig
diff --git a/source/_macros/gesso.macro.twig b/source/_macros/gesso.macro.twig
index 5a03a409..d2eb1f95 100644
--- a/source/_macros/gesso.macro.twig
+++ b/source/_macros/gesso.macro.twig
@@ -6,14 +6,3 @@
'title': title
} %}
{% endmacro %}
-
-
-{% macro tag(url, title, type = "full", size = "normal" ) %}
- {% include '@components/tag/tag.twig' with {
- 'url': url,
- 'title': title,
- 'type': type,
- 'size': size,
- 'faculty':faculty
- } %}
-{% endmacro %}
diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig
index 4d0c21aa..9f528c98 100644
--- a/source/_patterns/04-components/card/card.twig
+++ b/source/_patterns/04-components/card/card.twig
@@ -1,4 +1,4 @@
-{% import '@macros/gesso.macro.twig' as macros %}
+{% import '@components/tag/_tag_macro.twig' as macros %}
<article class="card {{ modifier_classes }} {% if show_hover %} card--show-hover {% endif %}" >
<div class="card__body">
diff --git a/source/_patterns/04-components/tag/_tag_macro.twig b/source/_patterns/04-components/tag/_tag_macro.twig
new file mode 100644
index 00000000..96040049
--- /dev/null
+++ b/source/_patterns/04-components/tag/_tag_macro.twig
@@ -0,0 +1,9 @@
+{% macro tag(url, title, type = "full", size = "normal" ) %}
+ {% include '@components/tag/tag.twig' with {
+ 'url': url,
+ 'title': title,
+ 'type': type,
+ 'size': size,
+ 'faculty':faculty
+ } %}
+{% endmacro %}
\ No newline at end of file
--
GitLab