Skip to content

Commit

Permalink
Gulpfix (#58)
Browse files Browse the repository at this point in the history
* 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”>
  • Loading branch information
kmurphychi247 and “Kerry authored Aug 21, 2024
1 parent acbde22 commit 80fb46d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const paths = {
},
scripts: {
src: "./assets/js/**/*.js",
dest: "dist/js",
dest: "dist",
},
},
};
Expand Down Expand Up @@ -167,4 +167,4 @@ exports.build = (done) => {
"baseStylesBuild",
"baseScriptsBuild",
)(done);
};
};
4 changes: 0 additions & 4 deletions saplings_child.libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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 %}
Expand All @@ -77,7 +82,7 @@
{{ content|without('field_media_multiple') }}
{% endblock %}
</div>

</div>
</div>
</div>
Expand Down
8 changes: 7 additions & 1 deletion templates/patterns/simple_card/pattern-simple-card.html.twig
Original file line number Diff line number Diff line change
@@ -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') }}
Expand All @@ -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') }}
Expand Down

0 comments on commit 80fb46d

Please sign in to comment.