Skip to content

Commit

Permalink
Merge pull request #425 from yalesites-org/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
vinmassaro authored Oct 2, 2024
2 parents 7254e27 + 9b970f8 commit 88dba4d
Show file tree
Hide file tree
Showing 28 changed files with 1,348 additions and 224 deletions.
13 changes: 9 additions & 4 deletions components/01-atoms/lists/taxonomy/yds-tags-list.twig
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
{% set visible_items = visible_items|default(3) %}
<ul {{ bem('taxonomy-list', ['tags'], '') }}>
{% for item in items|slice(0, 3) %}
<li {{ bem('item', [], 'taxonomy-list') }}>{{ item.content }}</li>
{% for item in items|slice(0, visible_items) %}
<li {{ bem('item', [], 'taxonomy-list') }}>
{% block list_item %}
{{ item.content }}
{% endblock %}
</li>
<li aria-hidden="true" {{ bem('divider', [], 'taxonomy-list') }}>{{ '|' }}</li>
{% endfor %}
{% if items|length > 3 %}
{% if items|length > visible_items %}
<li {{ bem('item', ['more'], 'taxonomy-list') }}>
<a href="{{ url }}">{{ '+' }}{{ items|length - 3 }}{{ " more"|t }}</a>
<a href="{{ url }}">{{ '+' }}{{ items|length - visible_items }}{{ " more"|t }}</a>
</li>
{% endif %}
</ul>
12 changes: 10 additions & 2 deletions components/02-molecules/banner/banner.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,21 @@ GrandHeroBanner.argTypes = {
defaultValue: false,
},
};
export const ImageBanner = ({ withVideo, bgColor }) =>
export const ImageBanner = ({ bgColor, size, withVideo }) =>
imageBannerTwig({
...imageData.responsive_images['16x9'],
image_banner__video: withVideo ? 'true' : 'false',
image_banner__content__background: bgColor,
image_banner__overlay_variation: 'full',
image_banner__size: size,
image_banner__video: withVideo ? 'true' : 'false',
});
ImageBanner.argTypes = {
size: {
name: 'Image Size',
type: 'select',
options: ['tall', 'short'],
defaultValue: 'tall',
},
withVideo: {
name: 'With Video',
type: 'boolean',
Expand Down
195 changes: 0 additions & 195 deletions components/02-molecules/banner/image/_yds-image-banner.scss

This file was deleted.

Loading

0 comments on commit 88dba4d

Please sign in to comment.