From 80fb46d83326b6323963c25f2d31be9c65b091b9 Mon Sep 17 00:00:00 2001
From: kmurphychi247 <82771690+kmurphychi247@users.noreply.github.com>
Date: Wed, 21 Aug 2024 09:28:59 -0500
Subject: [PATCH] Gulpfix (#58)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* adds in tab.js

* updates media collection template and gulp file to strip extra js folder

* updates template for h-100

---------

Co-authored-by: “Kerry <“kmurphychi@gmail.com”>
---
 gulpfile.js                                              | 4 ++--
 saplings_child.libraries.yml                             | 4 ----
 .../paragaphs/paragraph--media-collection.html.twig      | 9 +++++++--
 .../patterns/simple_card/pattern-simple-card.html.twig   | 8 +++++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 66e4a31..bf3763f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -43,7 +43,7 @@ const paths = {
     },
     scripts: {
       src: "./assets/js/**/*.js",
-      dest: "dist/js",
+      dest: "dist",
     },
   },
 };
@@ -167,4 +167,4 @@ exports.build = (done) => {
     "baseStylesBuild",
     "baseScriptsBuild",
   )(done);
-};
\ No newline at end of file
+};
diff --git a/saplings_child.libraries.yml b/saplings_child.libraries.yml
index 611d9af..34ccf3c 100644
--- a/saplings_child.libraries.yml
+++ b/saplings_child.libraries.yml
@@ -8,10 +8,6 @@ form:
     component:
       dist/css/form/form-required.css: { minified: true }
 
-am:
-  js:
-    dist/js/js/am.js: { minified: true }
-
 bs5-lightbox:
   js:
     https://cdn.jsdelivr.net/npm/bs5-lightbox@1.8.3/dist/index.bundle.min.js: { type: external, minified: true }
diff --git a/templates/overrides/paragaphs/paragraph--media-collection.html.twig b/templates/overrides/paragaphs/paragraph--media-collection.html.twig
index babe0e3..b9ebf3e 100644
--- a/templates/overrides/paragaphs/paragraph--media-collection.html.twig
+++ b/templates/overrides/paragaphs/paragraph--media-collection.html.twig
@@ -49,6 +49,11 @@
   ]
 %}
 
+{% set container_class_string = 'container' %}
+{% if paragraph.sa_container.value is not empty %}
+  {% set container_class_string = ' ' ~ paragraph.sa_container.value %}
+{% endif %}
+
 {% set margin_class_string = '' %}
 {% if paragraph.sa_margin.value is not empty %}
   {% set margin_class_string = ' ' ~ paragraph.sa_margin.value %}
@@ -63,7 +68,7 @@
 
 {% block paragraph %}
 <div{{ attributes.addClass(classes) }}>
-  <div class="{{ margin_class_string }}{{ padding_class_string }}">
+  <div class="{{ container_class_string }} {{ margin_class_string }}{{ padding_class_string }}">
     <div class="component-wrapper">
         <div class="
         {% if items_count != 1 and items_count != 3 %}
@@ -77,7 +82,7 @@
                 {{ content|without('field_media_multiple') }}
             {% endblock %}
         </div>
-        
+
     </div>
   </div>
 </div>
diff --git a/templates/patterns/simple_card/pattern-simple-card.html.twig b/templates/patterns/simple_card/pattern-simple-card.html.twig
index f89ddc5..5f376c1 100644
--- a/templates/patterns/simple_card/pattern-simple-card.html.twig
+++ b/templates/patterns/simple_card/pattern-simple-card.html.twig
@@ -1,5 +1,8 @@
 {% if variant and variant|lower == 'horizontal' %}
-  <div{{ attributes.addClass('card h-100') }}>
+{% if height %}
+  {% set attributes = attributes.addClass('h-100') %}
+{% endif %}
+  <div{{ attributes.addClass('card') }}>
     <div class="row g-0">
       <div class="{{ image_col_classes|default('col-md-4') }}">
         {{ image|add_class('img-fluid rounded-start') }}
@@ -26,6 +29,9 @@
     </div>
   </div>
 {% else %}
+{% if height %}
+  {% set attributes = attributes.addClass('h-100') %}
+{% endif %}
   <div{{ attributes.addClass('card') }}>
     {% if image and image_position != 'bottom' %}
       {{ image|add_class('card-img-top') }}